updated translations

36 files changed, 49549 insertions, 42112 deletions

diff --git a/po/be.po b/po/be.po
index 90e4c87e0..4f386ae35 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:42+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -27,20 +27,20 @@ msgstr ""
 msgid "Error."
 msgstr "Памылка Avahi"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -86,71 +86,71 @@ msgstr "Час"
 msgid "Progress"
 msgstr "Ступень выкананасці"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Файл: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Памер: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Вы"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Адпраўнік: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Атрымальнік: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Захаваць у: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Перадача файла скончаная"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Адкрыць дырэкторыю з файлам"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Перадача файла скасаваная"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Немагчыма ўсталяваць злучэнне з атрымальнікам."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Атрымальнік: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Памылка: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Перадача файла спыненая"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -158,127 +158,127 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Выберыце файл..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "Ад_правіць"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Апісанне: %s"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim не можа даступіцца да гэтага файла"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Немагчыма перапісаць наяўны файл \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Файл з такой назвай ужо існуе, а Вы не маеце правоў на яго перазапіс."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Немагчыма запісваць файлы ў дырэкторыю \"%s\""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Вы не маеце права ствараць файлы ў гэтай дырэкторыі."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Захаваць файл як..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Тып: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Апісанне: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хоча адправіць Вам файл:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Адпраўленне профіля..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Памылка перадачы файла"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/с)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Няправільны файл"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Немагчыма адправіць пусты файл"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Назва:"
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Адпраўнік:"
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Працягнуць"
 
@@ -438,92 +438,124 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Тут"
+
 #: gajim/features_window.py:101
 #, fuzzy
 msgid "Feature"
 msgstr "Здольнасці сервера"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Памылка чытання файла:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Памылка разбору файла:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Немагчыма захаваць малюнак у фармаце %(type)s. Захаваць як %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Захаваць малюнак як..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Мае "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Праграма:Невядомая"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?Сістэма:Невядомая"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Праграма:Невядомая"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Праграмы</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr "Вы не цікавіцеся гэтым чалавекам, але ён цікавіцца Вамі"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr "Вы цікавіцеся чалавекам, але ён не цікавіцца Вамі"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы чакаеце адказу на Ваш запыт"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Усе файлы"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Вечар"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Кіраванне профілямі проксі"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -568,13 +600,13 @@ msgid "_New Group Chat"
 msgstr "Новая групавая размова"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Няма ў спісе"
 
@@ -587,7 +619,7 @@ msgstr "Я хачу дадаць Вас у мой кантактны ліст"
 msgid "Send Single _Message…"
 msgstr "Адправіць _асобнае паведамленне"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 #, fuzzy
 msgid "Send Cus_tom Status"
@@ -608,25 +640,25 @@ msgstr "Транспарты"
 msgid "_Modify Transport"
 msgstr "Паказаць _транспарты"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "Змяніць _імя"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 #, fuzzy
 msgid "Remo_ve"
@@ -642,204 +674,224 @@ msgstr "Асабістыя звесткі"
 msgid "Send File..."
 msgstr "Адправіць _файл"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Людзі"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Дадаць у кантактны ліст"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Асабістыя звесткі"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Журнал"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Кіраванне закладкамі"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Змяніць _тэму"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Настаўленні _пакоя"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Апісанне: %s"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Змяніць м_янушку"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "_Змясціць у закладках"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Голас"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Стандартныя паведамленні:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Выканаць загад..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Чалавек адлучыўся"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Дадаць чалавека..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Пошук сервісаў"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Адправіць _асобнае паведамленне..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Адмысловы"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Настаўленні"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Паказаць _адлучаных людзей"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Кансоль XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Адміністратар"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "Ад_правіць паведамленне серверу"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Вызначыць MOTD"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Абнавіць MOTD"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Выдаліць MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Рахункаў няма"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Рахункі"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "паведамленне"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Сымболікі:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Немагчыма адшукаць базу дадзеных"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Мянушка"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Паведамленне"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Тэма"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -847,7 +899,7 @@ msgstr ""
 "Вы сапраўды хочаце ачысціць базу дадзеных? (Увага: закрыйце Gajim перад "
 "працягам)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -862,100 +914,100 @@ msgstr ""
 "\n"
 "Калі Вы выбралі Так, пачакайце..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Экспартаванне журналаў..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s а %(time)s сказаў: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Вы сапраўды хочаце выдаліць журнал размоў з выбранай асобай?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Немагчыма знайсці сервіс"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Асабістыя звесткі"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 msgstr[1] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 msgstr[2] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Гэтае дзеянне не аднаўляецца."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Чытанне профіля..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Асабістыя звесткі"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Фармат: ГГГГ-ММ-ДД"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Атрыманыя звесткі"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Вы не можаце абнавіць Вашыя асабістыя звесткі, не злучыўшыся з серверам."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Адпраўленне профіля..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Звесткі НЕ абноўленыя"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Памылка абнаўлення vCard"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -973,10 +1025,10 @@ msgstr "Імя чалавека: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Агульная"
@@ -1068,37 +1120,37 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Няправільны ID карыстальніка"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "ID карыстальніка не павінны вызначаць рэсурс."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Гэты чалавек ужо ёсць у у кантактным лісце."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ID карыстальніка:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Памылка дадання сервіса. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1106,61 +1158,61 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Jabber-праграма для GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Версія GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Версія PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Актыўныя распрацоўнікі:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Былыя распрацоўнікі:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Таксама хочам выказаць падзяку ўсім людзям, што збіраюць пакункі з праграмай "
 "для розных сістэмаў."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1171,13 +1223,13 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Злучэнне"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1186,320 +1238,344 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Больш не пытацца"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Запыт падпіскі"
+
+#: gajim/dialogs.py:2284
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запыт увагі на рахунак %s ад %s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запыт увагі ад %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Удзельнічаць у групавой размове"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Няправільны элемент"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Стварыць новы допіс"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Няправільны JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Няправільная спасылка"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Гэта не групавая размова"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Назва"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Злучэнне"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Новая групавая размова"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Дадаць новага чалавека"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Няправільны пароль"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Вы павінны ўвесці пароль."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Паролі розняцца"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Чалавек прыйшоў"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Новае паведамленне"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Новае асобнае паведамленне"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Новае прыватнае паведамленне"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончаная"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Чалавек змяніў стан"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Асобнае паведамленне"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Адправіць %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Атрымана %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Я %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Праверце злучэнне з \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Немагчыма адправіць пусты файл"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Вечар"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Фільтар:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Увод XML</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "Ад_правіць"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Марнаванне часу"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "_Змяніць"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "Вы_даліць"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 #, fuzzy
 msgid "Add"
 msgstr "Адрас"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 #, fuzzy
 msgid "Modify"
 msgstr "_Змяніць"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1507,7 +1583,7 @@ msgstr[0] "Дадаць _чалавека"
 msgstr[1] "Дадаць _чалавека"
 msgstr[2] "Дадаць _чалавека"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1515,181 +1591,181 @@ msgstr[0] "Выдаліць чалавека з спіса"
 msgstr[1] "Выдаліць чалавека з спіса"
 msgstr[2] "Выдаліць чалавека з спіса"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Настаўленні"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Вы атрымалі новае паведамленне:"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Памылка Avahi"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Спіс прыватнасці <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Спіс прыватнасці для %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Спіс прыватнасці"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Парадак: %s, дзеянне: %s, тып: %s, значэнне: %s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Парадак: %s, дзеянне: %s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Змяніць правіла</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Спісы прыватнасці для %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Няправільная назва спіса"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Выберыце гукавы файл"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Файлы Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Выберыце малюнак"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Малюнкі"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Выберыце малюнак"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Усе файлы"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Калі %s становіцца:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "для рахунка %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1713,334 +1789,372 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Перадача файлаў"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Шыфраванне адключанае"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s змяніў мянушку на %s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы выйшлі з пакоя \"%s\", альбо \"%s\" сышоў."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Змяненне тэмы"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Вызначце новую тэму:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Змена мянушкі"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Вызначце сваю новую мянушку:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Апісанне: %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 #, fuzzy
 msgid "and authenticated"
 msgstr "Аўтарызацыя"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Аўтарызацыя"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 #, fuzzy
 msgid "Conversation with "
 msgstr "Журнал размоў"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Злучэнне"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Адносіны: "
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Пакаранне %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Перадача файлаў"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Перадача файлаў"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групавой размовы %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2048,7 +2162,7 @@ msgstr ""
 "Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае "
 "паведамленне згубіцца."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2057,105 +2171,105 @@ msgstr ""
 "Тэма: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Перадача файлаў"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Памер: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Прыняць"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Далучыцца"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 #, fuzzy
 msgid "Error opening file"
 msgstr "Памылка чытання файла:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Групавыя размовы"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Транспарты"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Адпраўлены запыт на падпіску"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Аўтарызацыя забраная"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2163,11 +2277,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2175,39 +2289,39 @@ msgstr ""
 "Змяніўшы свой стан на нябачны, Вы такім чынам выйдзеце з гэтых групавых "
 "размоў. Вы сапраўды хочаце стаць нябачным?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Скасаваць перадачу файла"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -2216,94 +2330,94 @@ msgstr ""
 "Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем "
 "журналаў размоў."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Вы павінны прачытаць іх перад выдаленнем гэтага транспарта."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Транспарты будуць выдаленыя"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэтыя транспарты: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Вызначце новую мянушку для чалавека %s."
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Змяніць назву групы"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Выдаліць групу"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Прызначыць ключ OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Выберыце ключ для гэтага чалавека"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2313,12 +2427,12 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2328,15 +2442,15 @@ msgstr ""
 "чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас "
 "адлучаным."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Людзі будуць выдаленыя з Вашага кантактнага ліста"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2346,37 +2460,37 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Рахункаў няма"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можаце ўдзельнічаць у групавой размове нябачным"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2385,12 +2499,12 @@ msgstr ""
 "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
 "наступных сеансаў."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2400,12 +2514,12 @@ msgstr ""
 "кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
 "Jabber альбо некалькі транспартных рахункаў."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Няправільны файл"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2413,187 +2527,187 @@ msgstr[0] "%s хоча адправіць Вам файл:"
 msgstr[1] "%s хоча адправіць Вам файл:"
 msgstr[2] "%s хоча адправіць Вам файл:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Адправіць %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Зрабіць %s і %s мета-кантактамі"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Зрабіць %s і %s мета-кантактамі"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "_Праглядзець сервісы..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Усім карыстальнікам"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Усім актыўным карыстальнікам"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "За_прасіць"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Змяніць імя чалавека"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Змяніць _групы"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "Вы_даліць"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Чалавек адлучыўся"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Чалавек адлучыўся"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Журнал"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Кіраўнік журналаў"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Удзельнічаць у групавой размове"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "З_мяніць паведамленне аб стане"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Значка панэлі паведамленняў"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Паказваць толькі ў _галоўным вакне"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Адмысловы рэдактар настаўленняў"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Настаўленні пакоя"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Паказаць нягледжаныя _падзеі"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Злучэнне"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "%d нечытанае паведамленне"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2602,7 +2716,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2610,7 +2724,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2757,16 +2871,16 @@ msgstr "Шыфраванне адключанае"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Захаваць пароль"
 
@@ -2798,10 +2912,18 @@ msgstr "Выдаліць рахунак _толькі для Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Усе"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Няма"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
@@ -2873,12 +2995,12 @@ msgstr "Няправільны элемент"
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2976,92 +3098,115 @@ msgstr "Фарбаванае паведамленне ў групавой раз
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s гэтай групавой размовы"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Удзельнік"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Адміністратар"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Уладальнік"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 #, fuzzy
 msgid "Connected"
 msgstr "Злучэнне"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 #, fuzzy
 msgid "Disconnected"
 msgstr "Чалавек адлучыўся"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Сцягнуць"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Загрузіць"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Тып: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Перададзена: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Не пачатая"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Спыненая"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Скончаная"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:Прыпыненая"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Марнаванне часу"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Перадача"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Стан: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?transfer status:Прыпыненая"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Магу размаўляць"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Сышоў"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Заняты"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Мяне няма"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Адключаны"
 
@@ -3110,125 +3255,129 @@ msgstr "(Няма)"
 msgid "Hidden"
 msgstr "Схаваны"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал размоў %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Журнал размоў"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s цяпер %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Памылка: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Цяперашні стан: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "выкарыстоўвае рахунак %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Кіраванне закладкамі"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Няма ў спісе"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Паказаць _галоўнае вакно"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Назва вузла: "
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Здольнасці сервера"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Захаваць у: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3392,59 +3541,65 @@ msgstr "Падп_ісацца"
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "Тэкст пад гэтай рысаю ёсць тэкстам, які Вы яшчэ не бачылі"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "_Выйсці"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дзеянні для \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпедыі"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "У адрасе слоўніка не хапае \"%s\", і гэта не Вікі-слоўнік"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адрасе пошуку ў Сеціве не хапае \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Няправільны JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3457,32 +3612,37 @@ msgstr[2] "Учора"
 msgid "Write a message.."
 msgstr "Новае прыватнае паведамленне"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Вы не злучаны з серверам"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Групавыя размовы"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Паведамленні"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3493,273 +3653,278 @@ msgstr ""
 "Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
 "Выберыце іншую мянушку:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Гукі</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Вам забаронена казанне ў гэтай групавой размове."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Стварэнне групавых размоў абмежаванае."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас няма ў спісе ўдзельнікаў."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "памылка адпраўкі %s ( %s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 #, fuzzy
 msgid "Subscription request"
 msgstr "Запыт падпіскі"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Назіральнікі"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Адпісацца"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Няправільны пароль"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Няправільны пароль"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Вызначце пароль GPG для рахунка %s."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Выберыце Ваш ключ OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Перадача файлаў"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Выберыце файл..."
+
+#: gajim/gui_interface.py:1196
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Для кожнага _паведамлення"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запыт на перадачу файла"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3767,7 +3932,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3777,15 +3942,15 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3800,46 +3965,46 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Гэта не групавая размова"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Шыфраванне адключанае"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Гэта не групавая размова"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3847,42 +4012,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 #, fuzzy
 msgid "default"
 msgstr "Прадвызначана"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Вызначце пароль GPG для рахунка %s."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Выбар ключоў OpenPGP"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Няправільны пароль"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
@@ -3955,6 +4120,11 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3988,7 +4158,7 @@ msgstr "Няправільны элемент"
 msgid "The form is not filled correctly."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Нябачны"
 
@@ -4119,6 +4289,56 @@ msgstr ""
 "%s\n"
 "Мясцовыя паведамленні могуць не працаваць."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Немагчыма стартаваць мясцовы сервіс"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Немагчыма загрузіць малюнак"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Немагчыма загрузіць малюнак"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Шыфраванне дзейнічае"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Няма злучэння"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Тэма"
@@ -4145,7 +4365,16 @@ msgstr "Вы не можаце выдаліць актыўную тэму"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Аб'яднаныя рахункі"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr ""
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
@@ -4166,6 +4395,11 @@ msgstr "Вы пачалі размову ў рахунку %s"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "Вы_даліць"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4360,62 +4594,82 @@ msgstr "Змяніць пароль"
 msgid "Login Options"
 msgstr "Сымболікі:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus няма на гэтым кампутары, альбо няма адпаведнага модуля python"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Паказвае даведку па вызначаным загадзе"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "загад"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "паказаць даведку па загадзе"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Паказаць спіс усіх людзей у кантактным лісце. Звесткі пра кожнага чалавека "
 "друкуюцца на асобным радку"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "рахунак"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "паказаць людзей з пэўнага рахунка"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Паказаць спіс зарэгістраваных рахункаў"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Змяніць стан рахунка(ў)"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "стан"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "паведамленне"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "паведамленне стану"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4423,17 +4677,22 @@ msgstr ""
 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Змяніць стан рахунка(ў)"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Прыяры_тэт:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "_Зарэгістраваць новы рахунак"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4442,7 +4701,7 @@ msgstr ""
 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4452,29 +4711,29 @@ msgstr ""
 "рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без "
 "'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "змест паведамлення"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Калі вызначана, паведамленне будзе зашыфраванае адкрытым ключом"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўленае праз гэты рахунак"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4484,120 +4743,120 @@ msgstr ""
 "рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без "
 "'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "тэма"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "тэма паведамлення"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Атрымаць падрабязныя звесткі пра чалавека"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID чалавека"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Атрымаць падрабязныя звесткі аб рахунку"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Назва рахунка"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Адправіць файл чалавеку"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Месца файла"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Калі вызначана, файл будзе адпраўлены праз гэты рахунак"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Паказаць спіс усіх настаўленняў і іх значэнні"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Выстаўляе значэнне 'ключа' ў 'значэнне'"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "ключ=значэнне"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'ключ' ёсць назваю настаўлення, 'значэнне' ёсць выстаўляемым значэннем"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Выдаляе ўласцівасць"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "ключ"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "назва выдаляемай уласцівасці"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запісвае бягучыя настаўленні Gajim у файл .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Калі вызначана, то імя чалавека выбіраецца з спіса гэтага рахунка"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Вяртае бягучы стан (глабальны, калі не вызначаны рахунак)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Вяртае колькасць нечытаных паведамленняў"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Адправіць асаблівы XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "Адправіць XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4606,17 +4865,17 @@ msgstr ""
 "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
 "адпраўлены на ўсе рахункі"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Змяніць стан"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4625,21 +4884,21 @@ msgstr ""
 "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
 "адпраўлены на ўсе рахункі"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Не хапае аргумента \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4648,31 +4907,31 @@ msgstr ""
 "'%s' няма ў Вашым спісе.\n"
 "Калі ласка, вызначце рахунак для адпраўкі паведамлення."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "У Вас няма актыўнага рахунка"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s не знойдзены"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4683,7 +4942,7 @@ msgstr ""
 "Карыстанне: %s загад [аргументы]\n"
 "Загад ёсць адным з:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4692,7 +4951,7 @@ msgstr ""
 "Надта шмат аргументаў. \n"
 "Увядзіце \"%s help %s\" для падрабязнейшых звестак"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4866,11 +5125,6 @@ msgstr "Канец тыдня"
 msgid "Weekend!"
 msgstr "Выходныя!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "рахунка %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4896,52 +5150,52 @@ msgstr "Аўтарызацыя забраная"
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новае асобнае паведамленне ад %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новае прыватнае паведамленне ў групавой размове %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змяніў стан"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s прыйшоў"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s сышоў"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Няма ў спісе"
 
@@ -5730,75 +5984,73 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Выпраўленне хібы Jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5806,21 +6058,21 @@ msgstr ""
 "Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
 "выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5828,159 +6080,169 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s хоча адправіць Вам файл."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Аўтарызацыя"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Аўтарызацыя"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Аўтарызацыя"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова праверкі правапісу"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сон"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Хутка буду"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Хутка буду."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Ежа"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Ямо, пакіньце мне паведамленне."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Фільм"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Гляджу фільм."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Працую"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Працую."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Я на тэлефоне."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Сышоў"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Я цешуся з жыцця."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Я даступны."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Я магу размаўляць."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Мяне няма."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Бывай!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -5989,27 +6251,27 @@ msgstr ""
 "вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
 "ўтрымлівае Вашую мянушку."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "зялёны"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "садавіна"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "чалавек"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "мора"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Да"
@@ -6090,37 +6352,52 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr "%d нечытанае паведамленне"
 
+#: gajim/common/httpupload.py:137
+#, fuzzy
+msgid "File is empty"
+msgstr "Месца файла"
+
+#: gajim/common/httpupload.py:140
+#, fuzzy
+msgid "File does not exist"
+msgstr "Такой групавой размовы няма."
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "стварэнне базы журналаў"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "стварэнне базы журналаў"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Адправіць %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s з'яўляецца файлам, але павінна быць дырэкторыя"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim сканчвае работу"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
@@ -6130,11 +6407,11 @@ msgstr "%s з'яўляецца дырэкторыяй, але павінны б�
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "перанос базы журналаў у індэкс"
 
@@ -6143,237 +6420,237 @@ msgstr "перанос базы журналаў у індэкс"
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Перадалучыцеся самастойна."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Захаваць у: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Памылка злучэння"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Памылка аўтарызацыі з \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Праверце звесткі аўтарызацыі."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Людзі"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Не атрымана з-за нябачнага стану"
 
@@ -7311,159 +7588,184 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Няправільны знак у назве вузла."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Патрэбны адрас сервера."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Няправільны знак у імені карыстальніка."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Няправільны знак у назве рэсурса."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Заняты"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "М_яне няма"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Магу размаўляць"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?transfer status:Прыпыненая"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Злучэнне"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "Н_е тут"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Адключаны"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Нябачны"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?чалавек у стане:Невядомы"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?чалавек у стане:Ёсць памылкі"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Ужо ёсць падпіскі:Няма"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Да"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Ад"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Абодва"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Запыт (на падпіску):Няма"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Падпісацца"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Роля чалавека:Няма"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Мадэратары"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Мадэратар"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Удзельнікі"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Удзельнік"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Наведвальнікі"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Наведвальнік"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "сочыць за размовай"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "заняты чымсьці іншым"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "піша паведамленне..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "перастаў пісаць"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "закрыў вакно / картку размовы"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s кiБ"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7471,22 +7773,22 @@ msgstr[0] "Адправіць паведамленне"
 msgstr[1] "Адправіць паведамленне"
 msgstr[2] "Адправіць паведамленне"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "Я %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Ад"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7494,74 +7796,74 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Звесткі рэгістрацыі для транспарта %s не прыйшлі ў час"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "паведамленне"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
@@ -7596,45 +7898,45 @@ msgstr ""
 "Шына сеанса недаступная.\n"
 "Чытайце http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Немагчыма стартаваць мясцовы сервіс"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Немагчыма злучыцца праз порт %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Немагчыма змяніць стан рахунка \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
@@ -7882,6 +8184,11 @@ msgstr "_Забараніць казанне"
 msgid "_Add to Roster"
 msgstr "_Дадаць у кантактны ліст"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Выканаць загад..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8195,11 +8502,11 @@ msgstr "Пра мяне"
 msgid "Con_tinue"
 msgstr "_Працягнуць"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Прыпыніць"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Скасаваць"
@@ -8208,31 +8515,31 @@ msgstr "_Скасаваць"
 msgid "_Open Containing Folder"
 msgstr "_Адкрыць дырэкторыю з файлам"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Перадача файлаў"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "спіс файлаў у чарзе на перадачу"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Па_чысціць"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Выдаліць скончаныя, скасаваныя і хібныя запісы перадачы файлаў з спіса"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Выдаліць перадачу файла з спіса."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8240,32 +8547,37 @@ msgstr ""
 "Выдаліць адзін файл з чаргі перадачы. Калі яшчэ адбываецца перадача, яна "
 "спыняецца, а потым выдаляецца"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Скасаваць выбраную перадачу файла і выдаліць няскончаны файл"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Скасаваць перадачу файла"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Скасаваць выбраную перадачу файла"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "Ад_правіць і закрыць"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Схаваць вакно"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Паказаць нагадванне па сканчэнні перадачы файла"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Паказаць спіс перадаваных і атрыманых файлаў"
 
@@ -8274,7 +8586,7 @@ msgid "Register to"
 msgstr "Зарэгістравацца"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Добра"
 
@@ -8308,22 +8620,22 @@ msgstr "_Шрыфт:"
 msgid "Clear formatting"
 msgstr "Асабістыя звесткі"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Выберыце файл..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Падзея"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Падзеі"
@@ -8386,7 +8698,7 @@ msgstr "<b>Гукі</b>"
 msgid "<b>#</b>"
 msgstr "<b>Гукі</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "№"
 
@@ -9164,10 +9476,6 @@ msgstr "_Адкрыць..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Адмысловы рэдактар настаўленняў</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Адмысловы"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Пачаць _размову"
@@ -9425,7 +9733,7 @@ msgid "_Open Email Composer"
 msgstr "_Напісаць ліст"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Пачаць размову"
 
@@ -9471,6 +9779,10 @@ msgstr "Уласцівасці"
 msgid "Default:"
 msgstr "Прадвызначана"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Дадаць новага чалавека"
@@ -9496,6 +9808,16 @@ msgstr "_Мянушка:"
 msgid "_Group:"
 msgstr "_Група:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID карыстальніка:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Мянушка"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9534,6 +9856,11 @@ msgstr ""
 "Вы павінны злучыцца з транспартам, каб\n"
 "дадаць людзей з гэтага пратакола."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "З_мяніць паведамленне аб стане"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -9763,10 +10090,10 @@ msgstr "_Выканаць загад..."
 msgid "_Verify"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Рахункі"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Апісанне</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9793,11 +10120,6 @@ msgstr "Паказаць _адлучаных людзей"
 msgid "Show Transports"
 msgstr "Паказаць _транспарты"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Перадача файлаў"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9873,50 +10195,35 @@ msgstr ""
 msgid "Pr_int status:"
 msgstr "Стан друку:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Апісанне"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Паведаміць пра памылку"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Магчыма, гэтая памылка не крытычная, але пра яе варта паведаміць "
 "распрацоўнікам."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Запыт падпіскі"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Паведаміць пра памылку"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Адмовіць"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Забраць аўтарызацыю ў чалавека, каб ён не мог бачыць, калі Вы далучаны"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Дзеянні"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "А_ўтарызаваць"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Аўтарызаваць чалавека, каб ён мог бачыць, калі Вы далучаны"
 
@@ -9934,27 +10241,32 @@ msgstr ""
 msgid "Presets"
 msgstr "_Прысутнасць"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
 msgid "MUC server"
 msgstr "Назіральнікі"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "За_прасіць"
@@ -10076,11 +10388,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Вечар"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10246,6 +10553,16 @@ msgstr "Паказаць нягледжаныя _падзеі"
 msgid "Mute Sounds"
 msgstr "Адключыць гукі"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Уласцівасці"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Выйсці"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Каму:"
@@ -10650,14 +10967,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Настаўленні пакоя"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber-праграма"
@@ -10782,6 +11091,23 @@ msgid "Plugin manager"
 msgstr "Памылка злучэння"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "рахунка %s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Апісанне"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "Я хачу дадаць Вас у свой кантактны ліст."
+
+#~ msgid "_Actions"
+#~ msgstr "_Дзеянні"
+
+#, fuzzy
 #~ msgid "Start Chat..."
 #~ msgstr "_Пачаць размову"
 
@@ -10963,14 +11289,6 @@ msgstr "Памылка злучэння"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Карыстанне: /%s, хавае кнопкі размовы."
 
-#, fuzzy
-#~ msgid "File is empty"
-#~ msgstr "Месца файла"
-
-#, fuzzy
-#~ msgid "File does not exist"
-#~ msgstr "Такой групавой размовы няма."
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10980,58 +11298,6 @@ msgstr "Памылка злучэння"
 #~ "надта стары."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?transfer status:Прыпыненая"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?transfer status:Прыпыненая"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?чалавек у стане:Невядомы"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?чалавек у стане:Ёсць памылкі"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Ужо ёсць падпіскі:Няма"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Запыт (на падпіску):Няма"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Роля чалавека:Няма"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Усе"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Няма"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Тут"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "рахунак"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "стан"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "паведамленне"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Прыяры_тэт:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "пакой"
 
@@ -11043,31 +11309,6 @@ msgstr "Памылка злучэння"
 #~ msgid "?CLI:password"
 #~ msgstr "пароль"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Групавыя размовы"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Сцягнуць"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Загрузіць"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:Прыпыненая"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Праграма:Невядомая"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?Сістэма:Невядомая"
-
-#, fuzzy
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Праграма:Невядомая"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Паказваць нагадванні праз DBus і Notification-Daemon"
 
@@ -11383,18 +11624,6 @@ msgstr "Памылка злучэння"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Увод XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Фільтар:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Увод XML</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "Ад_правіць"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Кансоль XML для %s"
 
@@ -11618,10 +11847,6 @@ msgstr "Памылка злучэння"
 #~ msgstr "сочыць за размовай"
 
 #, fuzzy
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Апісанне</b>"
-
-#, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Імя чалавека"
 
@@ -12406,10 +12631,6 @@ msgstr "Памылка злучэння"
 #~ msgstr "Гэты рахунак ужо выкарыстоўваецца ў Gajim."
 
 #, fuzzy
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP: "
-
-#, fuzzy
 #~ msgid "Idle"
 #~ msgstr "Id"
 
@@ -12439,12 +12660,6 @@ msgstr "Памылка злучэння"
 #~ "Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй "
 #~ "асобы). (напр., /%s рагоча як конь.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Шыфраванне дзейнічае"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Шыфраванне адключанае"
-
 #~ msgid "_Retype Password:"
 #~ msgstr "Паўта_рыце пароль:"
 
diff --git a/po/be@latin.po b/po/be@latin.po
index 1ae80e8f8..1758513e5 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:41+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian Latin <i18n@mova.org>\n"
@@ -28,20 +28,20 @@ msgstr ""
 msgid "Error."
 msgstr "Pamyłka Avahi"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -87,71 +87,71 @@ msgstr "Čas"
 msgid "Progress"
 msgstr "Prahres"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazva fajłu: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Pamier: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Ty"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Dasłaŭ: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Atrymaŭ: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Pieradača fajłu skončana"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Adčyni kataloh z fajłam"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Pieradača fajłu anulavana"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "NIemahčyma złučycca ź inšym bokam."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Atrymoŭca: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -159,35 +159,35 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Vyšli"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Apisańnie: %s"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim nia moža dastupicca da hetaha fajłu"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Niemahčyma nadpisać fajł \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -195,93 +195,93 @@ msgstr ""
 "Fajł z takoj nazvaj užo isnuje, i nie staje pravoŭ dla nadpisańnia hetaha "
 "fajłu."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Hety fajł užo isnuje"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Što chočaš zrabić?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Niemahčyma zapisać u kataloh \"%s\""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie staje pravoŭ dla stvareńnia fajłaŭ u hetym katalohu."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Zapišy fajł jak..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Fajł: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Apisańnie: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Dasyłańnie profilu..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Niapravilny fajł"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Fajł: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Nazva:"
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Adpraŭnik:"
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Prypyni"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Praciahni"
 
@@ -441,46 +441,68 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Dastupny"
+
 #: gajim/features_window.py:101
 #, fuzzy
 msgid "Feature"
 msgstr "Zdolnaści serveraŭ"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Pamyłka razboru fajłu:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Niemahčyma zapisać vyjavu ŭ farmacie %(type)s. Zapisać jak %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Zapišy vyjavu jak..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Nie razmaŭlaju "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Klijent:Nieviadomy"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?AS:Nieviadomaja"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Klijent:Nieviadomy"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikacyi</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -488,7 +510,7 @@ msgid ""
 msgstr ""
 "Hety kantakt cikavicca tvajim statusam, ale ciabie jahony status nie cikavić"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -496,39 +518,49 @@ msgid ""
 msgstr ""
 "Ty cikaviśsia statusam hetaha kantaktu, ale jaho nie cikavić tvoj status"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Ty i hety kantakt uzajemna cikaviciesia statusam adno adnaho"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Ty i hety kantakt uzajemna cikaviciesia statusam adno adnaho"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ty čakaješ adkazu kantaktu na zapyt aŭtaryzacyi"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Usie fajły"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Viečar"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Kiruj profilami proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -573,13 +605,13 @@ msgid "_New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Niama ŭ śpisie"
 
@@ -592,7 +624,7 @@ msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
 msgid "Send Single _Message…"
 msgstr "Vyšli _asobnaje paviedamleńnie"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 #, fuzzy
 msgid "Send Cus_tom Status"
@@ -613,25 +645,25 @@ msgstr "Transparty"
 msgid "_Modify Transport"
 msgstr "Pakažy _transparty"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "Źmiani _nazvu"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 #, fuzzy
 msgid "Remo_ve"
@@ -647,211 +679,231 @@ msgstr "Źviestki ab kantakcie"
 msgid "Send File..."
 msgstr "Vyšli _fajł"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kantakty"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Dadaj u śpis kantaktaŭ"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Žurnał razmoŭ"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Kiruj zakładkami"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Źmiani _temu"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Kanfihuruj _pakoj"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Apisańnie: %s"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Źmiani _mianušku"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "_Stvary zakładku dla hetaja pakoju"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Daj hołas"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Šablony paviedamleńniaŭ statusu:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Vykanaj zahad..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Dałučysia da pakoju"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Dadaj kantakt..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "fajł"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Šukaj servisy"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Dašli _asobnaje aviedamleńnie..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Pašyranyja"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Nałady"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Kansol XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Administratar"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Dašli paviedamleńnie servera"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Vyznač MOTD"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Aktualizuj MOTD"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Vydal MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Konty niedastupnyja"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Konty"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "paviedamleńnie"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Smajliki:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Niemahčyma znajści bazu žurnałaŭ razmoŭ"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Mianuška"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Paviedamleńnie"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Chočaš ačyścić bazu źviestak? (NIE REKAMENDUJECCA RABIĆ Z AKTYŬNYM GAJIMAM)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -866,100 +918,100 @@ msgstr ""
 "\n"
 "Kali ty abraŭ \"Tak\", pačakaj..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Ekspartavańnie žurnałaŭ..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s a %(time)s napisaŭ: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Sapraŭdy chočaš vydalić žurnał razmoŭ z abranym kantaktam?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Niemahčyma znajści servis"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 msgstr[1] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 msgstr[2] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Vynikaŭ hetaj aperacyi niemahčyma anulavać."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Atrymańnie profilu..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Farmat: HHHH-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Źviestki atrymanyja"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Niemahčyma apublikavać asabistyja źviestki, nie dałučyŭšysia da servera."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Dasyłańnie profilu..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Źviestki NIE apublikavanyja"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Pamyłka publikacyi vCard"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -976,10 +1028,10 @@ msgstr "Nazva kantaktu: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Ahulnaja"
@@ -1070,37 +1122,37 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Kali łaska, zapoŭni źviestki ab kantakcie, jaki chočaš dadać"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Niapravilny identyfikatar karystalnika"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "Identyfikatar karystalnika nia moža ŭtrymlivać krynicy."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Hety kantakt užo jość u tvajim śpisie kantaktaŭ."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Identyfikatar karystalnika:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Pamyłka dadańnia servisu. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1108,59 +1160,59 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Klijent Jabber dla GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Versija GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Versija PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Dziejnyja raspracoŭniki:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Byłyja raspracoŭniki:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "I ŭrešcie, chočacca padziakavać usim apiekunam pakietaŭ."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Słoŭnik dla movy %s niedastupny"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1171,13 +1223,13 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Złučeńnie"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1186,320 +1238,344 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Bolš nie pytajsia"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Zapyt aŭtaryzacyi"
+
+#: gajim/dialogs.py:2284
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zapyt aŭtaryzacyi dla kontu %s ad %s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zapyt aŭtaryzacyi ad %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Dałučysia da pakoju"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Niapravilny zapis"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Stvary novy zapis"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Niapravilny JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Niapravilnaja spasyłka"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Heta nie pakoj"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nazva"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Złučeńnie"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Novaja hrupavaja razmova"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Dadaj novy kantakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Niapravilny parol"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Treba ŭvieści parol."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Paroli roźniacca"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kantakt dałučyŭsia"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Novaje paviedamleńnie"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Novaje asobnaje paviedamleńnie"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Novy list"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Pieradača fajłu skončana"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kantakt źmianiŭ status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Asobnaje paviedamleńnie"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Dašli %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Atrymana %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Я %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kali łaska, pravier, ci jość złučeńnie z \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisaŭ:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Viečar"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filter:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Uvod XML</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Vyšli"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Zatrymana"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "_Madyfikuj"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Vydal"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 #, fuzzy
 msgid "Add"
 msgstr "Adras"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 #, fuzzy
 msgid "Modify"
 msgstr "_Madyfikuj"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Vydal"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 #, fuzzy
 msgid "Groups"
 msgstr "Hrupa"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1507,7 +1583,7 @@ msgstr[0] "_Dadaj kantakt"
 msgstr[1] "_Dadaj kantakt"
 msgstr[2] "_Dadaj kantakt"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1515,182 +1591,182 @@ msgstr[0] "Vydalaje kantakt sa śpisu"
 msgstr[1] "Vydalaje kantakt sa śpisu"
 msgstr[2] "Vydalaje kantakt sa śpisu"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Nałady"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Atrymaŭ novy zapis:"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Pamyłka Avahi"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "JID:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Śpis pryvatnaści <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Śpis pryvatnaści dla %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Śpis pryvatnaści"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Paradak: %s, dziejańnie: %s, typ: %s, vartaść: %s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Paradak: %s, dziejańnie: %s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redahuj praviła</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dadaj praviła</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Śpisy pryvatnaści dla %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Niapravilnaja nazva śpisu"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Treba akreślić nazvu dla novaha śpisu pryvatnaści."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Abiary hukavy fajł"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Fajły ŭ Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Abiary vyjavu"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Vyjavy"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Abiary vyjavu"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Usie fajły"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kali %s maje status:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "dla kontu %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1714,334 +1790,372 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Pieradačy fajłaŭ"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Šyfravańnie adklučanaje"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s ciapier viadomy jak %s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Pamyłka dasyłańnia pryvatnaha paviedamleńnia"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ciabie niama ŭ pakoji \"%s\", albo \"%s\" pakinuŭ jaho."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Źmianiajecca tema"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Kali łaska, vyznač novuju temu:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Źmianiajecca mianuška"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Niapravilny JID pakoju"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Apisańnie: %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 #, fuzzy
 msgid "and authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 #, fuzzy
 msgid "Conversation with "
 msgstr "Žurnał razmoŭ"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Złučeńnie"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s zablakavany: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s zablakavaŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Suviaź: "
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s vyjšaŭ"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Kali začyniš hetaje akno, adłučyśsia ad pakoju."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Vypichvajecca %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Možaš akreślić pryčynu nižej:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Blakavańnie %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Pieradačy fajłaŭ"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Pieradačy fajłaŭ"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pakoju %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2049,7 +2163,7 @@ msgstr ""
 "Kali ty začyniš hetuju kartku i kali žurnały nie vieducca, to hetaje "
 "paviedamleńnie źniknie nazaŭždy."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2058,105 +2172,105 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Pamier: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Dazvol"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Dałučysia"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 #, fuzzy
 msgid "Error opening file"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Pakoji"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transparty"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Kali \"%s\" zadavolić tvoj zapyt, ty zmožaš bačyć jahony status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ciapier \"%s\" budzie zaŭsiody bačyć ciabie jak adłučanaha."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "Nielha vykarystać OpenPGP na hetym kamputary"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2164,11 +2278,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2176,39 +2290,39 @@ msgstr ""
 "Źmianiŭšy status na niabačny, ty adłučyśsia ad hetych pakojaŭ. Ty sapraŭdy "
 "chočaš stać niabačnym?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Anuluj pieradaču fajła"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Jość niečytanyja paviedamleńni"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -2217,16 +2331,16 @@ msgstr ""
 "Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
 "žurnałaŭ razmoŭ."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Musiš pračytać ich pierad vydaleńniem hetaha transpartu."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transpart \"%s\" budzie vydaleny"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2234,11 +2348,11 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transparty buduć vydalenyja"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2247,68 +2361,68 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetymi "
 "transpartami:%s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Vyznač novuju mianušku dla kantaktu %s."
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Źmiani nazvu hrupy"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chočaš vydalić hrupu %s sa śpisu kantaktaŭ?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Vydal taksama ŭsie kantakty z hetaj hrupy sa śpisu kantaktaŭ"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Pryznač kluč OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Abiary kluč dla hetaha kantaktu"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kantakt \"%s\" budzie vydaleny z tvajho śpisu kantaktaŭ"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2318,12 +2432,12 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Što chočaš zrabić?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2332,15 +2446,15 @@ msgstr ""
 "Vydaliŭšy hety kantakt, ty zmoŭčana taksama anuluješ jahonuju aŭtaryzacyju. "
 "U vyniku jon zaŭsiody budzie bačyć ciabie adłučanym."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Ja chaču, kab hety kantakt moh bačyć moj status paśla vydaleńnia"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kantakty buduć vydalenyja z tvajho śpisu kantaktaŭ"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2350,37 +2464,37 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Treba stvaryć kont, kab razmaŭlać ź inšymi kantaktami."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Niemahčyma dałučycca da pakoju, kali ty niabačny"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2389,12 +2503,12 @@ msgstr ""
 "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ. Tamu hetyja źviestki "
 "nia buduć dastupnyja pry nastupnym złučeńni."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2404,12 +2518,12 @@ msgstr ""
 "Zvyčajna hetaja mažlivaść vykarystoŭvajecca, kali adzin čałaviek "
 "karystajecca niekalkimi kontami Jabber albo niekalkimi kontami z transpartaŭ."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Niapravilny fajł"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2417,187 +2531,187 @@ msgstr[0] "%s choča dasłać tabie fajł:"
 msgstr[1] "%s choča dasłać tabie fajł:"
 msgstr[2] "%s choča dasłać tabie fajł:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Dašli %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Zrabi z %s i %s metakantakt"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Zrabi z %s i %s metakantakt"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Абнавіць"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "_Šukaj servisy..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "_Dašli hrupavoje paviedamleńnie"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Usim karystalnikam"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Usim dałučanym karystalnikam"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Zaprasi"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Źmiani _hrupy"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Vydal"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Žurnał razmoŭ"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Dałučysia da pakoju"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "Ź_miani paviedamleńnie statusu"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Redaktar dadatkovych naładaŭ"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kanfihuracyja pakoju"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Što chočaš zrabić?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Dałučajusia"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "%d niečytanaje paviedamleńnie"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2606,7 +2720,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2614,7 +2728,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2761,16 +2875,16 @@ msgstr "Šyfravańnie adklučanaje"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Vymahaje parolu"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Zachavaj parol"
 
@@ -2802,10 +2916,18 @@ msgstr "Vydal kont _tolki dla Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Usie"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Tolki ŭvachod i vychad"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Niama"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Novaja hrupavaja razmova"
@@ -2876,12 +2998,12 @@ msgstr "Niapravilny zapis"
 msgid "Custom port must be a port number."
 msgstr "Abrany port musić być numeram portu."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2979,92 +3101,115 @@ msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 msgid "Group Chat Message Received"
 msgstr "Novaje paviedamleńnie ŭ pakoji"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s hetaha pakoju"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Udzielnik"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administratar"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Ułaśnik"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 #, fuzzy
 msgid "Connected"
 msgstr "Złučeńnie"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Ściahni"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Zaciahni na server"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Typ: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Pierasłany: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Nie pačata"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Spyniena"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Zavieršana"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?status pieradačy:Prypyniena"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Zatrymana"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Pieradajecca"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?status pieradačy:Prypyniena"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Adyjšoŭ"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Zaniaty"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Niedastupny"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Adłučany"
 
@@ -3113,125 +3258,129 @@ msgstr "(Niama)"
 msgid "Hidden"
 msgstr "Schavany"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Žurnał razmoŭ z %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Žurnał razmoŭ"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s maje ciapier status %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Dziejny status: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Dziejny status: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "praz kont %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Kiruj zakładkami"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Pakažy _śpis kantaktaŭ"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Nazva hosta: "
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Zdolnaści serveraŭ"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Zapisany ŭ: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3393,7 +3542,7 @@ msgstr "_Aŭtaryzuj"
 msgid "_Unsubscribe"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -3402,52 +3551,58 @@ msgstr ""
 "Tekst pad hetaj rysaj addzialaje toj tekst, jaki ty jašče nia bačyŭ/nia "
 "bačyła"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "_Skonč pracu"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Dziejańni dla \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Pračytać artykuł u _Wikipedii"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Šukaj u _słoŭniku"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "U adrasie słoŭnika nie staje \"%s\", i heta nia Wiktionary"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "U adrasie dla web-pošuku nie staje \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Šukaj u Web"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Adčyni jak _spasyłku"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Niapravilny JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3460,32 +3615,37 @@ msgstr[2] "Učora"
 msgid "Write a message.."
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Niama złučeńnia z serveram"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Pakoji"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Paviedamleńni"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3496,274 +3656,279 @@ msgstr ""
 "Hetaja mianuška vykarystoŭvajecca ci zarehistravanaja na inšuju asobu.\n"
 "Kali łaska, vyznač inšuju mianušku nižej:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Prymaješ hety zapyt?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prymaješ hety zapyt?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Aŭtaryzacyja HTTP (%s) dla %s (id: %s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Treba ŭvieści parol, kab dałučycca da pakoju."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Huki</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Ty zablakavany ŭ hetym pakoji."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Takoha pakoju niama."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Takoha pakoju niama."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Stvareńnie pakojaŭ abmiežavanaje."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "pamyłka dasyłańnia %s ( %s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 #, fuzzy
 msgid "Subscription request"
 msgstr "Zapyt aŭtaryzacyi"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Naziralniki"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Aŭtaryzacyja pryniataja"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Kantakt \"%s\" aŭtaryzavaŭ ciabie, i ciapier ty možaš bačyć jaho status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Pravier złučeńnie albo pasprabuj paźniej."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Dałučany biez kluča OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Niapravilny parol"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Niapravilny parol"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Vyznač parol GPG dla kontu %s."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Abiary svoj kluč OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Fajł %(filename)s paśpiachova dasłany da %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Abiary fajł dla adsyłańnia..."
+
+#: gajim/gui_interface.py:1196
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Dla kožnaha _paviedamleńnia"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3771,7 +3936,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3781,15 +3946,15 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3804,46 +3969,46 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Heta nie pakoj"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Heta nie pakoj"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3851,42 +4016,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 #, fuzzy
 msgid "default"
 msgstr "Zmoŭčany"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vyznač parol GPG dla kontu %s."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Vybar kluča OpenPGP"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ty dałučyśsia da %s biaz OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Niapravilny parol"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
@@ -3959,6 +4124,11 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3992,7 +4162,7 @@ msgstr "Niapravilny zapis"
 msgid "The form is not filled correctly."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Niabačny"
 
@@ -4123,6 +4293,56 @@ msgstr ""
 "%s\n"
 "Lakalnyja paviedamleńni mohuć pracavać pamyłkova."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Niemahčyma ŭruchomić lakalny servis"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Niemahčyma adčytać vyjavu"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Niemahčyma adčytać vyjavu"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Šyfravańnie ŭklučanaje"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Złučeńnie niemahčymaje"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4149,7 +4369,16 @@ msgstr "Niemahčyma vydalić dziejnuju temu"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Abjadnanyja konty"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr ""
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Chutka viarnusia."
 
@@ -4170,6 +4399,11 @@ msgstr "Akno razmovy adčynienaje dla kontu %s"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Usie adčynienyja vokny razmovy buduć začynienyja. Praciahnuć?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Vydal"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4364,62 +4598,82 @@ msgstr "Źmiani parol"
 msgid "Login Options"
 msgstr "Smajliki:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Busu niama na hetym kamputary, albo nie staje modula Python"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Pakazvaje daviedku pa akreślenym zahadzie"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "zahad"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "pakažy daviedku pa zahadzie"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Adčyniaje akno z nastupnym niečytanym paviedamleńniem"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Pakazvaje śpis usich kantaktaŭ sa śpisu kantaktaŭ. Źviestki ab kožnym "
 "kantakcie źjaŭlajucca na novym radku"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "kont"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "pakažy kantakty akreślenaha kontu"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Pakazvaje śpis zarehistravanych kontaŭ"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr "adno z: offline, online, chat, away, xa, dnd, invisible "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "paviedamleńnie"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "paviedamlennie statusu"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4428,17 +4682,22 @@ msgstr ""
 "dla ŭsich kontaŭ, dla jakich vystaŭlenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Pryjary_tet:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Ja chaču za_rehistravać novy kont"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4448,7 +4707,7 @@ msgstr ""
 "dla ŭsich kontaŭ, dla jakich vystaŭlenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4458,30 +4717,30 @@ msgstr ""
 "kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki 'kont', "
 "biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "źmiest paviedamleńnia"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "Kali akreślena, paviedamleńnie budzie zašyfravana hetym publičnym klučom"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Kali akreślena, paviedamleńnie budzie dasłanaje z hetaha kontu"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4491,121 +4750,121 @@ msgstr ""
 "kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki 'kont', "
 "biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "tema paviedamleńnia"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID kantaktu"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Nazva kontu"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Dasyłaje kantaktu fajł"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "fajł"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Ściežka da fajłu"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Kali akreślena, fajł budzie dasłany z hetaha kontu"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Pakazvaje ŭsie nałady i ichnyja vartaści"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Akreślivaje dla 'kluča' 'vartaść'"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "kluč=vartaść"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'kluč' jość nazvaj nałady, 'vartaść' jość vartaściu hetaj nałady"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Vydalaje naładu"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "kluč"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nazva vydalenaj nałady"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisvaje dziejnyja nałady Gajima ŭ fajł .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Kali akreślena, kantakt biarecca sa śpisu kantaktaŭ hetaha kontu"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Viartaje dziejny status (hlabalny, kali nie akreśleny kont)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Viartaje dziejnaje paviedamleńnie statusu (hlabalnaha, kali nie akreśleny "
 "kont)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Viartaje kolkaść niečytanych paviedamleńniaŭ"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Dasyłaje svoj XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML dla dasyłańnia"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4614,17 +4873,17 @@ msgstr ""
 "Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
 "dasłany na ŭsie konty"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Źmiani status"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4633,21 +4892,21 @@ msgstr ""
 "Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
 "dasłany na ŭsie konty"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Nie staje arhumenta \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4656,31 +4915,31 @@ msgstr ""
 "'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
 "Kali łaska, akreśli kont dla dasyłańnia paviedamleńnia."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Nivodny kont nia dziejny"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Arhumenty:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s nia znojdzieny"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4691,7 +4950,7 @@ msgstr ""
 "Užyvańnie: %s zahad [arhumenty]\n"
 "Zahadam moža być adzin z nastupnych vyrazaŭ:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4700,7 +4959,7 @@ msgstr ""
 "Nadta šmat arhumentaŭ. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4874,11 +5133,6 @@ msgstr "Kaniec tydnia"
 msgid "Weekend!"
 msgstr "Vychodny!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "kontu %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4904,52 +5158,52 @@ msgstr "Aŭtaryzacyja anulavanaja"
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Novaje asobnaje paviedamleńnie ad %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Novaje pryvatnaje paviedamleńnie ŭ pakoji %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s źmianiŭ status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s dałučyŭsia"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s adłučyŭsia"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
@@ -5752,75 +6006,73 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Abychod dla Jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5828,21 +6080,21 @@ msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajim budzie pieradavać fajły z akreślenym "
 "adrasam IP i proxy-serveram z opcyi file_transfer_proxies."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5850,159 +6102,169 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s choča dasłać tabie fajł."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Kali łaska, zapoŭni źviestki ab kantakcie, jaki chočaš dadać"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Mova, dla jakoj treba praviarać pravapis"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Splu"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Chutka viarnusia"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Viarnusia praz paru chvilinaŭ."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Hladžu film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Pracuju"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Ja pracuju."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Vyjšaŭ"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Vyjšaŭ ciešycca z žyćcia."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Dastupny."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Achvotna parazmaŭlaju."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Niedastupny."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Nie turbavać."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Byvaj!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6010,27 +6272,27 @@ msgstr ""
 "Hukm jaki treba hrać, kali paviedamleńnie ŭ pakoji ŭtrymlivaje adno sa "
 "słovaŭ, akreślenych u opcyi muc_highlight_words, albo tvaju mianušku."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Huk, jaki treba hrać pry atrymańni novaha hrupavoha paviedamleńnia."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "zialony"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "bakaleja"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "čałaviek"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marski"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Da"
@@ -6111,37 +6373,52 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr "%d niečytanaje paviedamleńnie"
 
+#: gajim/common/httpupload.py:137
+#, fuzzy
+msgid "File is empty"
+msgstr "Ściežka da fajłu"
+
+#: gajim/common/httpupload.py:140
+#, fuzzy
+msgid "File does not exist"
+msgstr "Takoha pakoju niama."
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Dašli %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s jość fajłam, ale musiŭ być kataloh"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim zaviaršaje vykanańnie"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jość kataloham, ale musiŭ być fajł"
@@ -6151,11 +6428,11 @@ msgstr "%s jość kataloham, ale musiŭ być fajł"
 msgid "Error: cannot open %s for reading"
 msgstr "Pamyłka: niemahčyma adčytać %s"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "indeksavańnie bazy razmoŭ"
 
@@ -6164,237 +6441,237 @@ msgstr "indeksavańnie bazy razmoŭ"
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Pieradałučysia samastojna."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Niemahvyma dałučycca"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Pamyłka aŭtaryzacyi z \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Kali łaska, pravier pravilnaść loginu i parolu."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kantakty"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Nia ściahnuta z-za niabačnaha statusu"
 
@@ -7332,159 +7609,184 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Niapravilny znak u naźvie hostu."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Patrabujecca adras servera."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Niapravilny znak u imiani karystalnika."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Niapravilny znak u naźvie krynicy."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Zaniaty"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Niedastupny"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Achvotna parazmaŭlaju"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?status pieradačy:Prypyniena"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Dałučajusia"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Adyjšoŭ"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "Adł_učany"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "N_iabačny"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?kantakt maje status:Nieviadomy"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?kantakt maje status:Jość pamyłki"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Da"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Ad"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Dvuchbakovaja"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Zapyt (aŭtaryzacyi):Niama"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Aŭtaryzuj"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Maderatary"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Maderatar"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Udzielniki"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Udzielnik"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Naviedniki"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Naviednik"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "sočyć za razmovaj"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "robić štości inšaje"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "piša paviedamleńnie..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "pierastaŭ pisać"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "začyniŭ akno/kartku razmovy"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7492,22 +7794,22 @@ msgstr[0] "Dašli paviedamleńnie"
 msgstr[1] "Dašli paviedamleńnie"
 msgstr[2] "Dašli paviedamleńnie"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "Я %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Ad"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7515,74 +7817,74 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Źviestki rehistracyi dla transpartu %s nie pryjšli ŭ čas"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "paviedamleńnie"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
@@ -7618,45 +7920,45 @@ msgstr ""
 "Interfejs sesijaŭ niedastupny.\n"
 "Pasprabuj pračytać: http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kali łaska, pravier instalacyju Avahi."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Niemahčyma ŭruchomić lakalny servis"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Niemahčyma dałučycca da portu %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Niemahčyma źmianić status kontu \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7906,6 +8208,11 @@ msgstr "Za_blakuj"
 msgid "_Add to Roster"
 msgstr "_Dadaj u śpis kantaktaŭ"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Vykanaj zahad..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8219,11 +8526,11 @@ msgstr "Pra siabie"
 msgid "Con_tinue"
 msgstr "_Praciahni"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Prypyni"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Anuluj"
@@ -8232,62 +8539,67 @@ msgstr "_Anuluj"
 msgid "_Open Containing Folder"
 msgstr "_Adčyni kataloh z fajłam"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Pieradačy fajłaŭ"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "śpis pieradačaŭ fajłaŭ"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Pry_biarysia"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Vydal skončanyja, anulavanyja i chibnyja pieradačy fajłaŭ ź śpisa"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Vydal pieradaču fajła ź śpisu."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
 msgstr "Hetaje dziejańnie anuluje pieradaču fajła i vydalić jaje ź śpisu."
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Anuluj abranuju pieradaču fajła i vydal niedaciahnuty fajł"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Anuluj pieradaču fajła"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Anuluj abranuju pieradaču fajła"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Dašli i začyni"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Schavaj akno"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Pakažy nahadvańnie ŭ vypłyŭnym aknie pa zakančeńni pieradačy fajła"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Pakažy śpis pieradačaŭ fajłaŭ"
 
@@ -8296,7 +8608,7 @@ msgid "Register to"
 msgstr "Zarehistrujsia na"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Tak"
 
@@ -8330,22 +8642,22 @@ msgstr "_Šryft:"
 msgid "Clear formatting"
 msgstr "Źviestki ab kantakcie"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Klikni, kab ustavić smajlik (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Padzieja"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Padzieji"
@@ -8408,7 +8720,7 @@ msgstr "<b>Huki</b>"
 msgid "<b>#</b>"
 msgstr "<b>Huki</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "№"
 
@@ -9191,10 +9503,6 @@ msgstr "_Adčyni..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Redaktar dadatkovych naładaŭ</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Pašyranyja"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Pačni _razmovu"
@@ -9452,7 +9760,7 @@ msgid "_Open Email Composer"
 msgstr "_Adčyni paštovuju prahramu"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Pačni razmovu"
 
@@ -9498,6 +9806,10 @@ msgstr "Nałady"
 msgid "Default:"
 msgstr "Zmoŭčany"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Dadaj novy kantakt"
@@ -9523,6 +9835,16 @@ msgstr "_Mianuška:"
 msgid "_Group:"
 msgstr "_Hrupa:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Identyfikatar karystalnika:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Mianuška"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9561,6 +9883,11 @@ msgstr ""
 "Treba złučycca z šluzam, kab mahčy dadavać kantakty\n"
 "z hetaha pratakołu."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "Ź_miani paviedamleńnie statusu"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -9790,10 +10117,10 @@ msgstr "_Vykanaj zahad..."
 msgid "_Verify"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Konty"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Apisańnie</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9820,11 +10147,6 @@ msgstr "Pakažy _adłučanyja kantakty"
 msgid "Show Transports"
 msgstr "Pakažy _transparty"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Pieradačy fajłaŭ"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9900,35 +10222,25 @@ msgstr ""
 msgid "Pr_int status:"
 msgstr "Pakazvaj status:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Apisańnie"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Paviedam pra pamyłku"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Heta nie fatalna, ale ŭsio roŭna varta paviedamić pra takuju sytuacyju "
 "raspracoŭnikam."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Zapyt aŭtaryzacyi"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Paviedam pra pamyłku"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Admoŭ"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9936,16 +10248,11 @@ msgstr ""
 "Admoŭ na zapyt aŭtaryzacyi kantaktu, kab jon/jana nie mahli bačyć, kali ja "
 "dałučany"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Dziejańni"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Aŭtaryzuj"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
 "Aŭtaryzuj kantakt, kab jon/jana mahli bačyć, kali ja dałučany da servera"
@@ -9964,27 +10271,32 @@ msgstr ""
 msgid "Presets"
 msgstr "P_rysutnaść"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
 msgid "MUC server"
 msgstr "Naziralniki"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "_Zaprasi"
@@ -10106,11 +10418,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Viečar"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10276,6 +10583,16 @@ msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 msgid "Mute Sounds"
 msgstr "Ściš huki"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Nałady"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Skonč pracu"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Da:"
@@ -10683,14 +11000,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Kanfihuracyja pakoju"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Klijent kamunikacyi dla Jabber"
@@ -10815,6 +11124,23 @@ msgid "Plugin manager"
 msgstr "Niemahvyma dałučycca"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "kontu %s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Apisańnie"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
+
+#~ msgid "_Actions"
+#~ msgstr "_Dziejańni"
+
+#, fuzzy
 #~ msgid "Start Chat..."
 #~ msgstr "_Pačni razmovu"
 
@@ -10995,14 +11321,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
 
-#, fuzzy
-#~ msgid "File is empty"
-#~ msgstr "Ściežka da fajłu"
-
-#, fuzzy
-#~ msgid "File does not exist"
-#~ msgstr "Takoha pakoju niama."
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -11012,58 +11330,6 @@ msgstr "Niemahvyma dałučycca"
 #~ "sastareje."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?status pieradačy:Prypyniena"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?status pieradačy:Prypyniena"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?kantakt maje status:Nieviadomy"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?kantakt maje status:Jość pamyłki"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Zapyt (aŭtaryzacyi):Niama"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Usie"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Niama"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Dastupny"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "kont"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "paviedamleńnie"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Pryjary_tet:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "pakoj"
 
@@ -11075,31 +11341,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "?CLI:password"
 #~ msgstr "parol"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Pakoji"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Ściahni"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Zaciahni na server"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?status pieradačy:Prypyniena"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Klijent:Nieviadomy"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?AS:Nieviadomaja"
-
-#, fuzzy
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Klijent:Nieviadomy"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Pakazvaj nahadvańni z dapamohaj DBus i Notification-Daemon"
 
@@ -11417,18 +11658,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Uvod XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filter:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Uvod XML</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Vyšli"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Kansol XML dla %s"
 
@@ -11654,10 +11883,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgstr "sočyć za razmovaj"
 
 #, fuzzy
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Apisańnie</b>"
-
-#, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Nazva kantaktu"
 
@@ -12434,10 +12659,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgstr "Hety kont užo naładžany dla Gajim."
 
 #, fuzzy
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP: "
-
-#, fuzzy
 #~ msgid "Idle"
 #~ msgstr "Identyfikatar"
 
@@ -12469,12 +12690,6 @@ msgstr "Niemahvyma dałučycca"
 #~ "Užyvańnie: /%s <dziejańnie>, dasyłaje dziejańnie ŭ dziejny pakoj (ad "
 #~ "treciaj asoby). (naprykład, /%s rahoča, jak koń.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Šyfravańnie ŭklučanaje"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Šyfravańnie adklučanaje"
-
 #~ msgid "_Retype Password:"
 #~ msgstr "Paŭta_ry parol:"
 
diff --git a/po/bg.po b/po/bg.po
index 1e82a50d8..370356f71 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:43+0200\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -26,20 +26,20 @@ msgstr "Пинг?"
 msgid "Error."
 msgstr "Грешка."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Наистина ли да се изпрати файла?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Ако изпратите файл на %s, той/тя ще разбере истинския ви Jabber ID."
@@ -95,71 +95,71 @@ msgstr "Време"
 msgid "Progress"
 msgstr "Напредък"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Име на файл: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Вие"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Получател: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Запазен в: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Файловият трансфер завърши"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Отваряне на папката"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Файловият трансфер е прекъснат"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Не може да бъде установен контакт с отсрещната машина."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получател: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Грешка: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -167,126 +167,126 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Избор на файл за изпращане…"
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Изпращане"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Описание: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Неуспех при достъпа до този файл"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Неуспех при презаписването на съществуващия файл „%s“"
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Вече съществува файл с това име и нямате права да го презапишете."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Какво искате да направите?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папката „%s“ не е разрешена за запис"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Нямата права да създавате файлове в тази папка."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Запазване на файла като…"
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Изпращане на профила…"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Грешка при файловия трансфер"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Невалиден файл"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Име: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Изпращач: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Пауза"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "П_родължаване"
 
@@ -454,45 +454,67 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Изисква python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "На линия"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Функционалност"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Разширението не се поддържа"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Изображението не може да бъде запазено във формат %(type)s. Запазване като "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Запазване на изображението като…"
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "имам "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Неизвестен"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Неизвестна"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Неизвестен"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -501,7 +523,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -510,13 +532,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -524,27 +546,37 @@ msgid ""
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Няма чакащо запитване за записване."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Всички файлове"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Чистя"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Настройки на сървъра-посредник"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -588,13 +620,13 @@ msgid "_New Group Chat"
 msgstr "_Нова стая"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Не е в списъка"
 
@@ -609,7 +641,7 @@ msgstr ""
 msgid "Send Single _Message…"
 msgstr "Изпращане на _еднократно съобщение"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Изпращане на _специфично състояние"
@@ -627,25 +659,25 @@ msgstr "Управление на _транспорт"
 msgid "_Modify Transport"
 msgstr "Промяна на т_ранспорт"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Преименуване"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Деблокиране"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Блокиране"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "П_ремахване"
@@ -659,203 +691,223 @@ msgstr "_Информация"
 msgid "Send File..."
 msgstr "Изпращане на _файл…"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Покана на _контакти"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "Добавяне към _списъка…"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Информация"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "Ист_ория"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Управление на стаята"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Промяна на _темата…"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Настройки на _стаята…"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Унищожаване на стаята"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Смяна на псе_вдоним…"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Глас"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Настроени съобщения:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Минимизиране при затваряне"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Изпълнение на команда"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Изключване"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Добавяне на контакт…"
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Откриване на услуги"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Изпращане на _еднократно съобщение…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Напреднали"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Настройки"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Синхронизиране"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Сървър"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML конзола"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Администратор"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Изпращане на съобщение от сървъра…"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Настройване на MOTD…"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Актуализиране на MOTD…"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Изтриване на MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Няма наличен акаунт"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Акаунти"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "съобщение"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Емотикони:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Съобщение"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Тема"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -863,7 +915,7 @@ msgstr ""
 "Искате ли да изчистите базата от данни? (ИЗОБЩО НЕ СЕ ПРЕПОРЪЧВА АКО GAJIM Е "
 "СТАРТИРАН)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -878,99 +930,99 @@ msgstr ""
 "\n"
 "В случай, че изберете „Да“, изчакайте…"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Грешка в базата от данни"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Изнасяне на записите на разговорите…"
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s каза в %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Наистина ли искате да изтриете дневниците на избрания контакт?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Услугата не може да бъде намерена"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Отмяна на потвърждението"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
 msgstr[1] "Наистина ли искате да изтриете избраните съобщения?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Това е необратима операция."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Извличане на профила…"
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Информация за контакта"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Формат: гггг-мм-дд"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Получена информация"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Изпращане на профила…"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Информацията НЕ Е публикувана"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -987,10 +1039,10 @@ msgstr "Име на контакта: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Общи"
@@ -1080,36 +1132,36 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Не може да добавите себе си към списъка."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Идентификатор на потребител:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Грешка при добавянето на услугата. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1117,52 +1169,52 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Джабър клиент за GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Версия на GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Версия на PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Текущи разработчици:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Бивши разработчици:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "И не на последно място, бихме искали да благодарим на всички, които "
 "поддържат пакетите."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@gnu.org>\n"
@@ -1171,12 +1223,12 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Няма наличен речник за %s език"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1189,12 +1241,12 @@ msgstr ""
 "\n"
 "Функционалността за осветяване на сгрешени думи ще е изключена"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Несигурна връзка"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1206,501 +1258,525 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, наистина искам да се свържа по несигурен начин"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Да _не се задава този въпрос отново"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Невалиден псевдоним"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Псевдонимът съдържа непозволени знаци."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Искане за записване"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Искане за записване за акаунт „%(account)s“ от %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Влизане в стая"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Невалиден формат"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Невалиден псевдоним"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Създайте нова тема с желаното име."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Невалиден JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Грешен адрес"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Това не е стая"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Име"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Сървър"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Този акаунт не е свързан към сървъра"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Синхронизиране"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Продължен разговор"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Нова стая"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Добавяне на нов контакт"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Ново съобщение"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Покана за разговор в стая"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Контактът промени състоянието си"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение за акаунт „%s“"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "От %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Чистя"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Филтър:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Вход в XML формат</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Изпращане"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Тъжен"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Унил"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "П_ремахване"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr ""
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 #, fuzzy
 msgid "Modify"
 msgstr "Унил"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Изтриване"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Добавяне на _контакт"
 msgstr[1] "Добавяне на _контакт"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Премахване на контакт от списъка"
 msgstr[1] "Премахване на контакт от списъка"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Настройки"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Услугата върна грешка."
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Грешка."
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Филтър за уединение <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Филтър за уединение за %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Филтър за уединение"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ред: %(order)s, действие: %(action)s, вид: %(type)s, стойност: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ред: %(order)s, действие: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редактиране на правило</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавяне на правило</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Филтри за уединение за %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Невалидно име на филтър"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Поканени сте в стая."
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ви покани да се присъедините към дискусия"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ви покани в стая %(room_jid)s."
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Искате ли да приемете поканата?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Изображения"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Избор на изображение"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Всички файлове"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "за акаунт „%s“"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1724,67 +1800,95 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Грешка в сертификата на SSL"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Файлови трансфери"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Шифрирането чрез E2E е изключено"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s вече е познат като %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s вече е %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вече не сте в стая „%(room)s“ или „%(nick)s“ е напуснал(а)."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Сървърът ви няма поддръжка за мета-контакти"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Невалиден Jabber ID на стая"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Унищожаване на %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1793,251 +1897,261 @@ msgstr ""
 "Определено сте на път да унищожите тази стая.\n"
 "Може да укажете причина по-долу:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Може да въведете и друго място за срещи:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "и удостоверяването е успешно"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "и удостоверяването НЕ Е успешно"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Разговор с "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Продължен разговор"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s зададе темата на %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "На всеки участник е позволено да вижда вашия JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Стаята показва отсъстващ член"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "Стаята не показва отсъстващи членове"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Воденето на дневник на стаята е изключено"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Стаята не е анонимна"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Стаята е полу-анонимна"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Стаята е напълно анонимна"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s сек)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Беше създадена нова стая"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сървърът назначи или промени псевдонима ви в стаята"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "рангът е променен"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "Конфигурацията на стаята бе променена на „само за членове“"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "Изключване на системата"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s от %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s от %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Отлъчване на %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Файлови трансфери"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Файлови трансфери"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Списък с емотикони (Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s от стая %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Договорката за сесията отменена"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "НЯМА да се запазва дневник за сесията"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Тази сесия е шифрирана"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " и ЩЕ СЕ запазва дневник"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " и НЯМА да се запазва дневник"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2045,16 +2159,16 @@ msgstr ""
 "Идентичността на отсрещния контакт не е потвърдена. Натиснете бутона със "
 "щита за повече информация."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "Шифрирането чрез E2E е изключено"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2062,7 +2176,7 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2071,7 +2185,7 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2080,98 +2194,98 @@ msgstr ""
 "Неуспех при дешифрирането на съобщение от %s\n"
 "Възможно е да е било фалшифицирано."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s вече е %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Файлови трансфери"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Размер: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "_Акаунти"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Влизане"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 #, fuzzy
 msgid "Error opening file"
 msgstr "Грешка при четене на файл:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Стаи"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Транспорти"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG не е използваем"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2179,11 +2293,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2191,39 +2305,39 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "без синхронизация"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Отменя файловия трансфер"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2231,16 +2345,16 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята и контактът е в списъка."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2248,11 +2362,11 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Ще бъдат премахнати транспорти"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2261,69 +2375,69 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "тези транспорти: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Преименуване на контакт"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Преименуване на група"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Въведете ново име за група „%s“"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Премахване на група"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2332,11 +2446,11 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2345,15 +2459,15 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Ще бъдат премахнати контакти от списъка"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2362,7 +2476,7 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -2370,32 +2484,32 @@ msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Не може да влезете в стая, докато сте невидими."
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2404,14 +2518,14 @@ msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2421,195 +2535,195 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Невалиден адрес на файл:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Искате ли да изпратите този файл на %s:"
 msgstr[1] "Искате ли да изпратите тези файлове на %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Изпращане на %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Изпращане на файл до контакт"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Изпращане на файл до контакт"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Публикуване на мелодия"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Публикуване на мелодия"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Настройване на услуги…"
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Максимизиране на всички"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "_Изпращане на групово съобщение"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "До всички потребители"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "До всички включени потребители"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "По_кана в"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Управление на контакти"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Редактиране на _групи"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Максимизиране"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Изключване"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Изключване"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "Ист_ория"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Влизане в нова стая"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "Пром_яна на съобщението за състояние"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Демон за уведомления"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Показване на събитието в спис_ъка"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Редактор на настройки за напреднали"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Настройки на стаята"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показване на всички _чакащи събития"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Грешка в базата от данни"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Какво искате да направите?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Свързване"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Препращане на непрочетени съобщения"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2618,7 +2732,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2626,7 +2740,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2773,16 +2887,16 @@ msgstr "Емотиконите са изключени"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Запазване на паролата"
 
@@ -2814,10 +2928,18 @@ msgstr "Премахване на акаунт _само от Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "Всички"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Само влизащи и излизащи"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "Без"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Нова стая"
@@ -2884,11 +3006,11 @@ msgstr "Невалиден формат"
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Сертификатът вече е във файла"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2993,90 +3115,113 @@ msgstr "Осветено съобщение в стая"
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s на тази стая"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Няма"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Член"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Администратор"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Собственик"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [минимизиран]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Свързан"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Изключен"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Изтегляне"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Качване"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Тип: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Завършил"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Временно прекъснат"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Състояние: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Временно прекъснат"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Отсъствам"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Зает"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Изключен"
 
@@ -3125,126 +3270,130 @@ msgstr "(Няма)"
 msgid "Hidden"
 msgstr "Скрита"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История на разговорите с %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "История на разговорите"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Грешка при запис/четене от диска"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s вече е %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 #, fuzzy
 msgid "Error"
 msgstr "Грешка."
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Управление на отметките"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "в с_писъка"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "П_оказване на списъка"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Неуспех при зареждането на модула „idle“"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Състоянието „Невидим“ не се поддържа."
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Хост:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Функционалности на сървърите"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Запазен в: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3402,7 +3551,7 @@ msgstr "_Записване"
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3410,52 +3559,58 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто\n"
 "за последен път сте обърнали внимание на тази стая"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "_Изход"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия за „%s“"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Липсва „%s“ в адреса на речника и не е WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в адреса за търсене"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Отваряне като _връзка"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Невалиден JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3467,32 +3622,37 @@ msgstr[1] "Вчера"
 msgid "Write a message.."
 msgstr "Ново лично съобщение"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Не сте свързани към сървъра."
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Стаи"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Съобщения"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3504,109 +3664,109 @@ msgstr ""
 "участник.\n"
 "Укажете друг псевдоним по-долу:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Приемате ли това запитване за акаунт %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Неуспех при свързването"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Шрифт</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Вие сте отлъчени от стаята %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Стаята %s не съществува."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Стаята %s не съществува."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Създаването на стаи е ограничено."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Неуспех при влизането в стаята"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Не сте в списъка с членове на стаята %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка при изпращане на %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 #, fuzzy
 msgid "Subscription request"
 msgstr "Искане за записване"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3615,32 +3775,32 @@ msgstr ""
 "Винаги ще го виждате като изключен.\n"
 "Искате ли да го премахнете от списъка с контакти?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Отписване"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Неуспех при установяването на контакт с „%s“"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3649,36 +3809,36 @@ msgstr ""
 "Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
 "или е предоставил грешна парола.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Грешна парола"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Грешна парола"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Валидността на сертификата е изтекла"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Изберете вашия ключ на OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3687,97 +3847,102 @@ msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Грешка в сертификата на SSL"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Файлови трансфери"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Избор на файл за изпращане…"
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Неуспех при дешифриране на съобщението"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Конфликт с имената на потребители"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Конфликт на ресурсите"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запитване за файлов трансфер"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при проверка на сертификата на SSL"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3788,7 +3953,7 @@ msgstr ""
 "%(error)s\n"
 "Все още ли искате да се свържете със сървъра?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3801,15 +3966,15 @@ msgstr ""
 "Отпечатък тип SHA1 на сертификата:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Пренебрегване на грешката за този сертификат."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3829,7 +3994,7 @@ msgstr ""
 "\n"
 "Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3838,7 +4003,7 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3847,33 +4012,33 @@ msgstr ""
 "На път сте да изпратите паролата си чрез нешифрирана връзка. Сигурни ли сте, "
 "че искате да го направите?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Това не е стая"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Емотиконите са изключени"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Темата с емотикони не беше намерена, така че са изключени."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr "Темата с емотикони не беше намерена, така че са изключени."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Това не е стая"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3881,41 +4046,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "по подразбиране"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Няма зададен ключ на GPG"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Грешна парола"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
@@ -3986,6 +4151,11 @@ msgstr "— ще бъде воден дневник за съобщенията"
 msgid "- messages will not be logged"
 msgstr "— няма да бъде воден дневник за съобщенията"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4018,7 +4188,7 @@ msgstr "Невалиден формат"
 msgid "The form is not filled correctly."
 msgstr "Псевдонимът съдържа непозволени знаци."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Невидим"
 
@@ -4152,6 +4322,56 @@ msgstr ""
 "Изпращането и получаването на съобщения тип „link-local“ може и да не "
 "функционира правилно."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Неуспех при стартирането на локална услуга"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Неуспех при зареждането на изображението"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Услугата върна грешка."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Неуспех при зареждането на изображението"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "В момента няма връзка"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Тема"
@@ -4177,7 +4397,17 @@ msgstr "Не може да изтриете текущата тема"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Смесени акаунти"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Използване на агент на _GPG"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Сега се връщам."
 
@@ -4202,6 +4432,11 @@ msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Премахване"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4396,51 +4631,65 @@ msgstr "Промяна на парола"
 msgid "Login Options"
 msgstr "_Емотикони:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Показва помощ за специфична команда"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "команда"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "показване на помощ за команда"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Показва или скрива списъка"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Показване на списък с всички контакти. Всеки контакт се появява на отделен "
 "ред"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "акаунт"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "показва само контактите на дадения акаунт"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Показване на списък с регистрираните акаунти"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "състояние"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4450,11 +4699,17 @@ msgstr ""
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
 "(невидим)"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "съобщение"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "съобщение за състояние"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4463,17 +4718,22 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Приори_тет:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "_Искам да регистрирам нов акаунт"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4483,7 +4743,7 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4493,30 +4753,30 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "текст на съобщението"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ако е указано, съобщението ще се шифрира, използвайки този публичен ключ"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4526,121 +4786,121 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "тема"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "тема на съобщението"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Изпраща ново съобщение до стаята, в която сте влезли."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID на стаята, която ще получи съобщението"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Получаване на подробна информация за контакта"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за акаунта"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Име на акаунта"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Път до файл"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "„ключ“ е името на настройката, „стойност“ е стойността, която се задава"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Изтрива обект от настройките"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "ключ"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "име на настройката за изтриване"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запазва текущото състояние на настройките във файла .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако е указано, контактът се взима от списъка с контакти на този акаунт"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Връща текущото състояние (общото, в случай, че не е указан акаунт)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Връща текущото съобщение за състояние (общото, в случай, че не е указан "
 "акаунт)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Връща броя непрочетени съобщения"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Изпраща указан XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML за изпращане"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4649,17 +4909,17 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Промяна на състоянието"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Псевдоним"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4668,19 +4928,19 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Проверка дали Gajim е стартиран"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Показва или скрива прозореца на IPython"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4689,16 +4949,16 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4707,16 +4967,16 @@ msgstr ""
 "Употреба: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4727,7 +4987,7 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4736,7 +4996,7 @@ msgstr ""
 "Твърде много аргументи. \n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4910,11 +5170,6 @@ msgstr "Края на седмицата"
 msgid "Weekend!"
 msgstr "Събота и неделя!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "за акаунт „%s“"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4939,52 +5194,52 @@ msgstr "Стаята е била унищожена"
 msgid "You can join this room instead: %s"
 msgstr "Вместо това може да влезете в тази стая: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестна грешка на SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ново еднократно съобщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ново лично съобщение от стая „%s“"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Съобщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ново съобщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s промени състоянието си"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s се включи"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s се изключи"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Не е в списъка"
 
@@ -5820,22 +6075,18 @@ msgstr "Активира шифриране тип „ESessions“ за този
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Дали Gajim да започва шифрирана сесия автоматично, ако е възможно?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Списък (разделен с шпации) на видове свързвания. Може да съдържа „tls“, "
-"„ssl“ или „plain“."
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5844,13 +6095,13 @@ msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показване на предупреждение преди използване на стандартната библиотека на "
 "SSL."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -5858,37 +6109,37 @@ msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Списък (разделен с шпации) от грешки на SSL, които да се пренебрегват."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5897,11 +6148,11 @@ msgstr ""
 "Колко секунди да се чака за отговор на изпратен пакет за поддържане на "
 "връзката, преди да да се опита свързване наново."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Заобикалка заради Jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5909,21 +6160,21 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Отговор на заявки"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Изпратени заявки"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5931,12 +6182,12 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s иска да ви изпрати файл."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5944,148 +6195,158 @@ msgstr ""
 "Когато се договаря шифрирана сесия, да се приема ли, че искате собствените "
 "съобщения да се запазват в дневник?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Използване на удостоверяване"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Използване на удостоверяване"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Използване на удостоверяване"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Език, за който желаете да се проверяват сгрешените думи."
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спя"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Хапвам"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, така че ми оставете съобщение."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Филм"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Работя"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Работя."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Навън"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "На линия съм."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Свободен за разговор."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Не съм на разположение."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Не ме притеснявайте."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Довиждане!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6093,27 +6354,27 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "зелена"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "колониална"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "хуманна"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "морска"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "За"
@@ -6192,37 +6453,50 @@ msgstr "Всички непрочетени съобщения бяха преп
 msgid "Forward unread message then disconnect"
 msgstr "Препращане на непрочетени съобщения"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Файлът не съдържа нищо"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Файлът не съществува"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "създаване на база от данни за разговорите"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "създаване на база от данни за разговорите"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Изпращане на %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s e файл, а би трябвало да е папка"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Спиране на програмата"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s e папка, а би трябвало да е файл"
@@ -6232,11 +6506,11 @@ msgstr "%s e папка, а би трябвало да е файл"
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "синьозелена"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "мигриране на базата от данни с дневници към индекси"
 
@@ -6245,194 +6519,194 @@ msgstr "мигриране на базата от данни с дневници
 msgid "%s is not a valid loglevel"
 msgstr "%s не е валидно ниво за дневник"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Неуспех при получаването на списъка с отменени сертификати"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Неуспех при дешифрирането на подписа на сертификата"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Неуспех при дешифрирането на подписа на списъка с отменени сертификати"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Неуспех при декодирането на публичния ключ на издателя"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Грешка при проверката на подписа на сертификата"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Грешка при проверката на подписа на списъка с отменени сертификати"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Сертификатът все още не е валиден"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Валидността на сертификата е изтекла"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "Списъкът с отменени сертификати все още не е валиден"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "Валидността на списъка с отменени сертификати е изтекла"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка при форматирането на полето „notBefore“ на сертификата"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка при форматирането на полето „notAfter“ на сертификата"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „lastUpdate“ на списъка с отменени "
 "сертификати"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „nextUpdate“ на списъка с отменени "
 "сертификати"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Изчерпана памет"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Само-подписан сертификат"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Само-подписан сертификат в удостоверителската верига"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Неуспех при проверката на първия сертификат"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Удостоверителската верига е твърде дълга"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Сертификатът е отменен"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Невалиден сертификат на удостоверителя"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Максималната дължина на пътя е надвишена"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Неподдържана цел на сертификата"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Сертификатът не е доверен"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Сертификатът е отхвърлен"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Несъответствие на издателя на сертификата"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Несъответствие на идентификатора и сертифициращия орган"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Несъответствие на серийния номер на издателя и сертифициращия орган"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Основната употреба не включва подписване на сертификати"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Грешка на приложението за проверка"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Свържете се наново."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Сървърът „%(name)s“ отговори погрешно на запитването за регистрация: "
 "%(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сървърът „%s“ предостави различна форма за регистрация"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Неуспех при свързване с „%s“"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Неуспех при свързване с „%s“"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Запазен в: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Неуспех при свързване с акаунт „%s“"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Връзката на акаунт „%s“ се разпадна. Опит за повторно свързване."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Автентичността на сертификата на %s може да е под въпрос."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6441,7 +6715,7 @@ msgstr ""
 "\n"
 "Грешка на SSL: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6450,39 +6724,39 @@ msgstr ""
 "\n"
 "Неизвестна грешка на SSL: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Автентичността на сертификата на %s може да е под въпрос."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Неуспех при свързване с „%s“"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Покана на _контакти"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
 
@@ -7353,255 +7627,280 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Невалиден символ в името на хоста."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Необходим е адрес на сървъра."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Невалиден символ в потребителското име."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Зает"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "Временно прекъснат"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Свързване"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Неизвестно"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Има грешки"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Няма"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "За"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "От"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Двустранно"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Няма"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Записване"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Не е установен"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Председатели"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Председател"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Участници"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Участник"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Посетители"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Посетител"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "пише съобщение…"
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d непрочетено съобщение"
 msgstr[1] "%d непрочетени съобщения"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " от стая %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " от потребител %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " от %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d чакащо събитие"
 msgstr[1] "%d чакащи събития"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Изтече времето за зареждане на изображението"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Изображението е твърде голямо"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "Списъкът с отменени сертификати все още не е валиден"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Изтече времето за зареждане на изображението"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "съобщение"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
@@ -7642,43 +7941,43 @@ msgstr ""
 "Липсва „session bus“.\n"
 "Опитайте се да прочетете http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверете дали Avahi или Bonjour е инсталиран."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Неуспех при стартирането на локална услуга"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Неуспех при свързването с порт %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Проверете дали е стартиран avahi-daemon."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Съобщението ви не можа да бъде изпратено."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7928,6 +8227,11 @@ msgstr "_Забраняване на достъпа"
 msgid "_Add to Roster"
 msgstr "Добавяне към _списъка…"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Изпълнение на команда"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8211,11 +8515,11 @@ msgstr "Относно"
 msgid "Con_tinue"
 msgstr "П_родължаване"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "П_ауза"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Отказ"
@@ -8224,32 +8528,32 @@ msgstr "_Отказ"
 msgid "_Open Containing Folder"
 msgstr "_Отваряне на папката"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Файлови трансфери"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "списък с файлови трансфери"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Из_чистване"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Премахва завършилите, прекъснатите или провалени файлови трансфери от списъка"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Премахване на файловия трансфер от списъка."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8257,32 +8561,37 @@ msgstr ""
 "Това действие премахва файлов трансфер от списъка. Ако трансферът е активен, "
 "първо се прекъсва и след това се премахва."
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Отменя избрания файлов трансфер и изтрива непълния файл"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Отменя файловия трансфер"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Отменя избрания файлов трансфер"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "Изпра_щане и затваряне"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Скрива прозореца"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомяване при завършване на файловия трансфер"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Показва списък с файловите трансфери между вас и останалите"
 
@@ -8291,7 +8600,7 @@ msgid "Register to"
 msgstr "Регистриране към"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Да"
 
@@ -8324,21 +8633,21 @@ msgstr ""
 msgid "Clear formatting"
 msgstr "Информация за контакта"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Списък с емотикони (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Избор на файл за изпращане…"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Списък с емотикони (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Събитие"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Събитие"
@@ -8401,7 +8710,7 @@ msgstr "<b>Шрифт</b>"
 msgid "<b>#</b>"
 msgstr "<b>Шрифт</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "№"
 
@@ -9161,10 +9470,6 @@ msgstr "_Отваряне…"
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Редактор на настройките за напреднали</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Напреднали"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Започване на _разговор"
@@ -9408,7 +9713,7 @@ msgid "_Open Email Composer"
 msgstr "_Отваряне на пощенската програма"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
@@ -9453,6 +9758,10 @@ msgstr "Настройки"
 msgid "Default:"
 msgstr "По подразбиране"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Добавяне на нов контакт"
@@ -9478,6 +9787,16 @@ msgstr "Псе_вдоним:"
 msgid "_Group:"
 msgstr "_Група:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Идентификатор на потребител:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Псевдоним"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9516,6 +9835,11 @@ msgstr ""
 "Трябва да сте свързани към транспорта, за да може\n"
 "да добавите контакт от този протокол."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "Пром_яна на съобщението за състояние"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Настроение:</b>"
@@ -9742,10 +10066,9 @@ msgstr "_Изпълнение на команда…"
 msgid "_Verify"
 msgstr "_Проверка"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Акаунти"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(Информация за <b>Е-сесия</b>)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9772,11 +10095,6 @@ msgstr "Показване на изкл_ючените контакти"
 msgid "Show Transports"
 msgstr "Показване на т_ранспорти"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Файлови трансфери"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9850,50 +10168,35 @@ msgstr "Минимизиране при автоматично влизане"
 msgid "Pr_int status:"
 msgstr "Изписване на състоянията:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Описание"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Докладване на грешка"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Вероятно не е фатална, но би трябвало да се докладва на разработчиците."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Искане за записване"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Докладване на грешка"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Отказване"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 "Отказване на упълномощаване на контакт, така че да не знае кога сте свързани"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Действия"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Упълномощаване"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Упълномощаване на контакта, така че да знае кога сте свързани"
 
@@ -9911,11 +10214,11 @@ msgstr ""
 msgid "Presets"
 msgstr "С_ъстояние"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Поканете приятели!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9924,15 +10227,20 @@ msgstr ""
 "На път сте да започнете разговор в стая.\n"
 "Изберете контактите, които искате да поканите."
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Изберете сървър за стаи."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Сървър за стаи"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "По_кана"
 
@@ -10052,11 +10360,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Чистя"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10218,6 +10521,16 @@ msgstr "Показване на всички _чакащи събития"
 msgid "Mute Sounds"
 msgstr "Изключване на звука"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Настройки"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Изход"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "До:"
@@ -10624,14 +10937,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Настройки на стаята"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Джабър клиент за бързи съобщения"
@@ -10756,6 +11061,30 @@ msgid "Plugin manager"
 msgstr "Неуспех при свързването"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "за акаунт „%s“"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Описание"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "Бих искал(а) да ви добавя към списъка си."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Списък (разделен с шпации) на видове свързвания. Може да съдържа „tls“, "
+#~ "„ssl“ или „plain“."
+
+#~ msgid "_Actions"
+#~ msgstr "_Действия"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Изисква python-dbus."
 
@@ -10950,12 +11279,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Употреба: /%s, скрива бутоните за разговор."
 
-#~ msgid "File is empty"
-#~ msgstr "Файлът не съдържа нищо"
-
-#~ msgid "File does not exist"
-#~ msgstr "Файлът не съществува"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10985,58 +11308,6 @@ msgstr "Неуспех при свързването"
 #~ msgstr "Изисква python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "Временно прекъснат"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "Временно прекъснат"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Неизвестно"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Има грешки"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Няма"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Няма"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Не е установен"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "Няма"
-
-#~ msgid "?print_status:All"
-#~ msgstr "Всички"
-
-#~ msgid "?print_status:None"
-#~ msgstr "Без"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "На линия"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "акаунт"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "състояние"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "съобщение"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Приори_тет:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "стая"
 
@@ -11048,31 +11319,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "?CLI:password"
 #~ msgstr "парола"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Стаи"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Изтегляне"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Качване"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "Временно прекъснат"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Неизвестен"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Неизвестна"
-
-#, fuzzy
-#~ msgid "?Time:Unknown"
-#~ msgstr "Неизвестен"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr ""
 #~ "Използване на DBus и Notification-Daemon за показване на уведомленията"
@@ -11286,10 +11532,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "Choose _Key..."
 #~ msgstr "Избор на _ключ…"
 
-#, fuzzy
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Използване на агент на _GPG"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11426,18 +11668,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Вход в XML формат</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Филтър:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Вход в XML формат</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Изпращане"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML конзола за %s"
 
@@ -11821,9 +12051,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Покана на контакти в разговора (Ctrl+G)"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(Информация за <b>Е-сесия</b>)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Име на контакта"
@@ -12739,9 +12966,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
diff --git a/po/br.po b/po/br.po
index 570043b7f..69c79e472 100644
--- a/po/br.po
+++ b/po/br.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -32,20 +32,20 @@ msgstr ""
 msgid "Error."
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -91,72 +91,72 @@ msgstr "Mare"
 msgid "Progress"
 msgstr "Araokadur"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Anv ar restr: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Ment: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "C'hwi"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Kaser: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Resever:"
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Echu eo an treuzkas"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Digeriñ ar renkell pal"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Nullet eo bet an treuzkas"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Resever:"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Sac'het an treuzkas"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -164,127 +164,127 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Dibabit ur restr da gas..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Kas"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Taolennadur: %s"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "N'hell ket Gajim tizhout ar restr-mañ"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Restr: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Doare: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Taolennadur: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Kas ur _restr"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Fazi treuzkas"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Restr direizh"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Restr:"
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Anv:"
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Kaser:"
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Ehan"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Kenderc'hel"
 
@@ -444,45 +444,67 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Hegerz"
+
 #: gajim/features_window.py:101
 #, fuzzy
 msgid "Feature"
 msgstr "Perzhioù ar servijerien"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Enrollet e-barzh: %s"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Dianav"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Dianav"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Dianav"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -490,7 +512,7 @@ msgid ""
 msgstr ""
 "Dedennet eo an darempred-mañ gant ho pezañs, met n'oc'h ket gant he/e hini"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -499,39 +521,49 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Dedennet hoc'h an eil gant bezañs egile/eben"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Dedennet hoc'h an eil gant bezañs egile/eben"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Emaoc'h o c'hortoz respont an darempred d'ho koulenn koumanantiñ"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr ""
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "An holl restroù"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Darvoud"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Merañ an aeladoù proksi"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -576,13 +608,13 @@ msgid "_New Group Chat"
 msgstr "Flap a-stroll"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Ket er roll"
 
@@ -595,7 +627,7 @@ msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
 msgid "Send Single _Message…"
 msgstr "Kas ur gemennadenn _simpl"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 #, fuzzy
 msgid "Send Cus_tom Status"
@@ -616,25 +648,25 @@ msgstr "Dorioù"
 msgid "_Modify Transport"
 msgstr "Dorioù"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Adenvel"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 #, fuzzy
 msgid "Remo_ve"
@@ -650,204 +682,224 @@ msgstr "Titouroù"
 msgid "Send File..."
 msgstr "Kas ur _restr"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Darempredoù"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Ouzhpennañ er roll"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Titouroù"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Istoradur"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Merañ ar sinedoù"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Kemmañ ar _sujed"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Ke_fluniañ ar flap"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Taolennadur: %s"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Cheñch _lesanv"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 msgid "Request Voice"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Kemennadennoù raklakaet:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "urzhiad"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Darempred diluget"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Ouzhpennañ un darempred..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "restr"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Dizoleiñ ar servijoù"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Kas ur gemennadenn _simpl..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Dre ar munut"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Penndibaboù"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Servijer"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Merour-ez"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Lakaat MOTD"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Hizivaat MOTD"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Dilemel MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Kont ebet hegerz"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Kontoù"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "kemennadenn"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Boulomelloù:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Deiziad"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Lesanv"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Kemennadenn"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Titl"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -855,7 +907,7 @@ msgstr ""
 "Ha fellout a ra deoc'h naetaat an titourva? (DIALIET GROÑS M'EMAÑ GAJIM O "
 "VONT EN-DRO)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -864,99 +916,99 @@ msgid ""
 "In case you click YES, please wait…"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Oc'h ezporzhiañ an istoradur..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s e lâras %(who)s: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempred-mañ?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "N'eo ket bet kavet ar servij"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Titouroù"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 msgstr[1] "Ha fellout a ra deoc'h da vat diverkañ ar c'hemennadennoù diuzet?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Setu un ober n'eus ket tu da vont war e giz."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 msgid "Retrieving profile…"
 msgstr ""
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Titouroù"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Stumm : BBBB-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 #, fuzzy
 msgid "Information received"
 msgstr "Resevet ar bedadenn"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Rankout a rit bezaén luget evit embann ho titouroù hiniennel."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Kas ur restr"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr ""
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "C'hwitet eo embannadur ar vCard"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -974,10 +1026,10 @@ msgstr "Anv an darempred: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Hollek"
@@ -1072,38 +1124,38 @@ msgstr "Leuniit titouroù an darempred a zo da vezañ ouzhpennet er gont %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Leuniit an titouroù diwar-benn an darempred da ouzhpennañ"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 #, fuzzy
 msgid "User ID:"
 msgstr "ID arveriad-ez:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1111,61 +1163,61 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Ur flaperez Jabber e GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, python-format
 msgid "GTK+ Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, python-format
 msgid "PyGObject Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Diorroerien kent:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Diorroerien kent:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "Evit echuiñ, e fell deomp trugarekaat holl gempennerien ar pakad."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1174,13 +1226,13 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Kevreadenn"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1189,511 +1241,533 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Chom hep goulenn ket"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Goulenn koumanantiñ"
+
+#: gajim/dialogs.py:2284
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Goulenn enskrivañ evit ar gont %s digant %s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Road direizh"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 msgid "Please choose a nickname"
 msgstr ""
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Ger-kuzh faos"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Anv"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Servijer"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Kevreadenn"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Flap a-stroll"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Ouzhpennañ un darempred nevez"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Rankout a ra an daou c'her-kuzh bezañ heñvel en daou dakad."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Kemennadenn simpl nevez"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "De %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Darvoud"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Sil:"
+
+#: gajim/dialogs.py:3568
+msgid "XML Input"
+msgstr ""
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Envoyer"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Chomlec'h"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "_Kemmañ"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Dilemel"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 #, fuzzy
 msgid "Add"
 msgstr "Chomlec'h"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 #, fuzzy
 msgid "Modify"
 msgstr "_Kemmañ"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Dilemel"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 #, fuzzy
 msgid "Groups"
 msgstr "Strollad"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Ouzhpennañ un _darempred"
 msgstr[1] "Ouzhpennañ un _darempred"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Dilemel an darempred diouzh ar roll"
 msgstr[1] "Dilemel an darempred diouzh ar roll"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Penndibaboù"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr ""
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "ID Jabber:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 #, fuzzy
 msgid "Privacy List"
 msgstr "Roll argas"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Taolennadur: %s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes banni de ce salon."
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Dibabit ur skeudenn"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "An holl restroù"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "evit ar gont %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1717,335 +1791,372 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Treuzkasoù"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Lazhet eo ar sifrañ"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s a zo bremañ %s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "N'emaoc'h ket er webgaoz \"%s\" ken, pe neuze eo aet kuit \"%s\"."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr ""
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "ID jabber direizh"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Taolennadur: %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 #, fuzzy
 msgid "and authenticated"
 msgstr "Implij an diskleriañ"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Implij an diskleriañ"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 #, fuzzy
 msgid "Conversation with "
 msgstr "Istoradur ar gaoz"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Kevreadenn"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo argaset gant %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ha sur oc'h e fell deoc'h kuitaat ar flap \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ma serrit ar prenestr-mañ, e tigevreoc'h diouzh ar flap-mañ."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Treuzkasoù"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Treuzkasoù"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "O paouez resev ur gemennadenn nevez digant \"%s\" emaoc'h"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2053,7 +2164,7 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2062,106 +2173,106 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Treuzkasoù"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Taille : "
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Asantiñ"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "E_barzhiñ"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 #, fuzzy
 msgid "Groupchats"
 msgstr "Flapoù a-stroll"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Dorioù"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Kaset eo bet an aotre"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ma asant \"%s\" ar c'houmanant e weloc'h he/e stad."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Adalek bremañ e welo ac'hanoc'h \"%s\" atav evel pa vefec'h ezlinenn."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2169,11 +2280,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Kemer a rit perzh e unan pe meur a webgaoz"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2181,39 +2292,39 @@ msgstr ""
 "Tremen d'ar stad diwelus a lakao ac'hanoc'h da zilugañ diouzh ar webkaozioù-"
 "se. Ha sur oc'h e fell deoc'h bezañ diwelus?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter les salons \"%s\" ?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Nullañ an treuzkas"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -2221,17 +2332,17 @@ msgid ""
 msgstr ""
 "Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -2240,12 +2351,12 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2254,72 +2365,72 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Adenvel"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Dilemel"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2328,12 +2439,12 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2342,16 +2453,16 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit dre-ziouer he/e aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Aotreañ an darempred-mañ da welout ma stad war-lerc'h e zilam"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2360,251 +2471,251 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Restr direizh"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Fellout a ra da %s kas deoc'h ur restr:"
 msgstr[1] "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Kas %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Strollañ %s ha %s"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Strollañ %s ha %s"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Embann"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Embann"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "_Dizoleiñ ar servijoù..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr ""
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilisateurs En _Ligne"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr ""
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Darempredoù"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Kemmañ ar _strolladoù"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Dilemel"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Darempred diluget"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Darempred diluget"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Istoradur"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Kemmañ an titour-stad"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Diskouez er _roll hepken"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Aozer kefluniañ dre ar munut"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kefluniañ ar webgaoz"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "O lugañ"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Gajim - %d gemennadenn nevez"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2613,7 +2724,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2621,7 +2732,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2771,16 +2882,16 @@ msgstr "Lazhet eo ar sifrañ"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
@@ -2812,10 +2923,20 @@ msgstr "Dilemel ar gont diwar Gajim _hepken"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Diskouez an eur:"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr ""
 
+#: gajim/config.py:1949
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Diskouez an eur:"
+
 #: gajim/config.py:2015
 #, fuzzy
 msgid "New Group Chat"
@@ -2888,12 +3009,12 @@ msgstr "Road direizh"
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Darempred er roll dija"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2992,95 +3113,120 @@ msgstr "Message d'un Salon mis en Sur-brillance"
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Hini ebet"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 #, fuzzy
 msgid "Member"
 msgstr "_Ezel"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 #, fuzzy
 msgid "Administrator"
 msgstr "_Merour-ez"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 #, fuzzy
 msgid "Owner"
 msgstr "_Perc'hener-ez"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 #, fuzzy
 msgid "Connected"
 msgstr "Kevreadenn"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 #, fuzzy
 msgid "Disconnected"
 msgstr "Darempred diluget"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Pellgargañ"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Kas"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Doare:"
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Treuzkaset:"
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "N'eo ket kroget"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Arsavet"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Echu"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+#, fuzzy
+msgid "?transfer status:Paused"
+msgstr "Diskouez an eur:"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr ""
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "O treuzkas"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Stad:"
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Diskouez an eur:"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Ezvezant"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr ""
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Dihegerz"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Ezlinenn"
 
@@ -3132,125 +3278,129 @@ msgstr "(Hini ebet)"
 msgid "Hidden"
 msgstr "Elfennoù kuzh"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istoradur flapiñ gant %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Istoradur ar gaoz"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s a zo bremañ %(status)s : %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Kemmañ an titour-stad"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "en ur implij ar gont %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Merañ ar sinedoù"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Ket er roll"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Diskouez ar _roll-darempredoù"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr ""
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Servijer:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Perzhioù ar servijerien"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Enrollet e-barzh: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3414,7 +3564,7 @@ msgstr "_Koumanantiñ"
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -3423,53 +3573,59 @@ msgstr ""
 "Dindan al linenn e welit ar pezh a zo bet lâret er sal-flapiñ dibaoe ar wech "
 "diwezhañ ho peus taolet ur sell ennañ."
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "_Kuitaat"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Mankout a ra un \"%s\" e-barzh URL ar geriaoueg, ha n'eo ket WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Mankout a ra un \"%s\" e-barzh URL ar webklask"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr ""
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "ID jabber direizh"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3481,33 +3637,38 @@ msgstr[1] "Dec'h"
 msgid "Write a message.."
 msgstr "Kemennadenn hiniennel nevez"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Flapoù a-stroll"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Kemennadennoù"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3519,274 +3680,279 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Aotre HTTP (%s) evit %s (id : %s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Un mot de passe est requis pour rejoindre ce salon."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Sonioù</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Vous êtes banni de ce salon."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 #, fuzzy
 msgid "Subscription request"
 msgstr "Goulenn koumanantiñ"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Sellerien"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Aotreet oc'h bet gant \"%s\" da welet e stad."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Koumanantiñ"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "N'eus ket tu da dizhout \"%s\""
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Ger-kuzh faos"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Ger-kuzh faos"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Treuzkasoù"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Gant berzh ho peus kaset %(filename)s da %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Dibabit ur restr da gas..."
+
+#: gajim/gui_interface.py:1196
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Da _bep kemennadenn:"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Goulenn treuzkas"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3794,7 +3960,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3804,15 +3970,15 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3827,46 +3993,46 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr ""
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3874,42 +4040,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 #, fuzzy
 msgid "default"
 msgstr "Dilemel"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Luget e voc'h da %s hep OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Ger-kuzh faos"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
@@ -3981,6 +4147,11 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP : "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4013,7 +4184,7 @@ msgstr "Road direizh"
 msgid "The form is not filled correctly."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Diwelus"
 
@@ -4141,6 +4312,56 @@ msgid ""
 "Link-local messaging might not work properly."
 msgstr ""
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Dibosupl eo kargañ ar skeudenn"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Dibosupl eo kargañ ar skeudenn"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Dibosupl eo kargañ ar skeudenn"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "War enaou emañ ar sifrañ"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "N'eus ket tu da gevreañ"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Gwiskadur"
@@ -4166,7 +4387,16 @@ msgstr "N'hellit ket dilemel ar gwiskadur red"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Kontoù strollet"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr ""
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
@@ -4187,6 +4417,11 @@ msgstr "N'ho peus kont bev ebet"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Dilemel"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4380,64 +4615,84 @@ msgstr "Cheñch ar ger-kuzh"
 msgid "Login Options"
 msgstr "Boulomelloù:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "N'eus ket eus D-Bus war an urzhiataer-mañ, pe mankout a ra ur mollad python"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "diskouez ar skoazell evit un urzhiad resis"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "urzhiad"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "diskouez ar skoazell evit an urzhiad"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "A zifoup ur prenestr gant ar gemennadenn dilenn da-heul"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "A ziskouez ur roll eus an holl zarempredoù, pep darempred war ul linenn."
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "kont"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "diskouez darempredoù ar gont roet hepken"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "A ziskouez roll ar c'hontoù enrollet"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "stad"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "kemennadenn"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "titour stad"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4445,17 +4700,22 @@ msgstr ""
 "A cheñch stad ar gont \"kont\". Ma n'eus hini ebet roet, klaskit cheñch stad "
 "an holl gontoù o deus an dibab \"sync with global status\" enaouet"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Digant"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4464,7 +4724,7 @@ msgstr ""
 "A cheñch stad ar gont \"kont\". Ma n'eus hini ebet roet, klaskit cheñch stad "
 "an holl gontoù o deus an dibab \"sync with global status\" enaouet"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4475,29 +4735,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "korf ar gemennadenn"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Ma vez resisaet, e vo kaset ar gemennadenn en ur implij ar gont-mañ"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4507,160 +4767,160 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 #, fuzzy
 msgid "subject"
 msgstr "Titl"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 #, fuzzy
 msgid "message subject"
 msgstr "Kemennadenn gaset"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Evit kargañ titouroù-munut un darempred"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID an darempred"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Evit kargañ titouroù-munut ur gont"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Anv ar gont"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Kas ur restr d'un darempred"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "restr"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Treug ar restr"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "m'eo resisaet, e vo kaset ar rest en ur implij ar gont-mañ"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Roll an holl zibaboù hag o zalvoudoù"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "A laka talvoud an 'alc'hwezh' da 'dalvoud'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "alc'hwezh=talvoud"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'alc'hwezh' eo anv an dibab, 'talvoud' eo an talvoud da lakaat dezhañ"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "A zilam un elfenn dibab"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "touchenn"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "anv an dibab da zilemel"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "A skriv stad red dibaboù Gajim er restr .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "A ro ar stad red (an hini hollek, nemet ez eus bet resisaet ur gont bennak)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "A gas an titour-stad red (an hini hollek, nemet ez eus bet resisaet ur gont "
 "bennak)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "A ro an niver a gemennadennoù chomet dilenn"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr ""
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr ""
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Darempred diluget"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4669,31 +4929,31 @@ msgstr ""
 "N'emañ ket '%s' en hor roll darempredoù.\n"
 "Resisait ar gont evit kas ur gemennadenn."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "N'ho peus kont bev ebet"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "N'eo ket bet kavet %s"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4704,14 +4964,14 @@ msgstr ""
 "Implij: %s urzhiad [arguments]\n"
 "urzhiad eo unan eus :\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4895,11 +5155,6 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "eus ar gont %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, fuzzy, python-format
 msgid ""
@@ -4925,52 +5180,52 @@ msgstr "Dilamet eo bet an aotre"
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Kemennadenn simpl nevez digant %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Kemennadenn hiniennel nevez digant ar sal %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Emañ %(nickname)s o paouez lugañ"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Emañ %(nickname)s o paouez dilugañ"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 #, fuzzy
 msgid "Not in roster"
 msgstr "Ket er roll"
@@ -5700,283 +5955,291 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Leuniit an titouroù diwar-benn an darempred da ouzhpennañ"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Implij an diskleriañ"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Implij an diskleriañ"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Implij an diskleriañ"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "O labourat"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Er-maez"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr ""
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr ""
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "Glas"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr ""
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "Mab-den"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "Glas-mor"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Da"
@@ -6064,37 +6327,52 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr "Gajim - %d gemennadenn nevez"
 
+#: gajim/common/httpupload.py:137
+#, fuzzy
+msgid "File is empty"
+msgstr "Treug ar restr"
+
+#: gajim/common/httpupload.py:140
+#, fuzzy
+msgid "File does not exist"
+msgstr "Ce salon n'existe pas."
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Kas %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "ur restr eo %s met rankout a rafe bezañ ur renkell"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Emañ Gajim o vont da guitaat diouzhtu"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
@@ -6104,11 +6382,11 @@ msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "Cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "o krouiñ titourva an istoradur"
@@ -6118,237 +6396,237 @@ msgstr "o krouiñ titourva an istoradur"
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr ""
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Kevreadenn"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Darempredoù"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -7282,257 +7560,282 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Arouezenn zireizh en anv-ostiz."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Chomlec'h ar servijer dre ret"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Arouezenn ziereizh en anv-arveriad-ez"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr ""
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr ""
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "_Hegerz"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Diwelus"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Dianav"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "fazi"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Hini ebet"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Da"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Digant"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "An daou"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Hini ebet"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Hini ebet"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "a skriv ur gemennadenn..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s Ko"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Kas ur gemennadenn"
 msgstr[1] "Kas ur gemennadenn"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "kemennadenn"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
@@ -7566,45 +7869,45 @@ msgstr ""
 "Dihegerz eo bus an estez.\n"
 "Klaskit o lenn http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 #, fuzzy
 msgid "Could not start local service"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7858,6 +8161,11 @@ msgstr "_Argas"
 msgid "_Add to Roster"
 msgstr "_Ouzhpennañ er roll"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "urzhiad"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8175,11 +8483,11 @@ msgstr "Diwar-benn"
 msgid "Con_tinue"
 msgstr "_Kenderc'hel"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Ehan"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Nullañ"
@@ -8188,32 +8496,32 @@ msgstr "_Nullañ"
 msgid "_Open Containing Folder"
 msgstr "_Digeriñ ar renkell pal"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Treuzkasoù"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "roll an treuzkasadoù"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Naetaat"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Diverkañ an treuzkasadoù echu, nullaet pe sac'het"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Dilemel an treuzkas restroù diwar ar roll"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8221,32 +8529,37 @@ msgstr ""
 "An ober-mañ a zilam an treuzkasoù diouzh ar roll. Ma 'z eus un treuzkas "
 "oberiant, e vo arsavet anezhañ ha dilamet da c'houde"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "A nulla an treuzkas dibabet hag a zilam ar restr diglok"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Nullañ an treuzkas"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "A nulla an treuzkas dibabet"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Kas & Serriñ"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "A guzha ar prenestr"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 #, fuzzy
 msgid "Shows a list of file transfers between you and others"
 msgstr "A ziskouez ur roll eus an dreuzkasoù etrezoc'h hag ar re all"
@@ -8256,7 +8569,7 @@ msgid "Register to"
 msgstr "En em enrollañ war"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Mat eo"
 
@@ -8290,22 +8603,22 @@ msgstr "_Nodrezh:"
 msgid "Clear formatting"
 msgstr "Titouroù"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Dibabit ur restr da gas..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Darvoud"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Darvoudoù"
@@ -8368,7 +8681,7 @@ msgstr "<b>Sonioù</b>"
 msgid "<b>#</b>"
 msgstr "<b>Sonioù</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr ""
 
@@ -9142,10 +9455,6 @@ msgstr "_Digeriñ..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Aozer kefluniañ munut</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Dre ar munut"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Kregiñ da _flapiñ"
@@ -9405,7 +9714,7 @@ msgid "_Open Email Composer"
 msgstr "_Digeriñ ar bostelerez"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Kregiñ da flapiñ"
 
@@ -9452,6 +9761,10 @@ msgstr "Penndibaboù"
 msgid "Default:"
 msgstr "Dilemel"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Ouzhpennañ un darempred nevez"
@@ -9482,6 +9795,16 @@ msgstr "Lesanv:"
 msgid "_Group:"
 msgstr "Strollad:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID arveriad-ez:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Lesanv"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9515,6 +9838,11 @@ msgid ""
 "to add a contact from this protocol."
 msgstr ""
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Kemmañ an titour-stad"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -9754,10 +10082,10 @@ msgstr "urzhiad"
 msgid "_Verify"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Kontoù"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Taolennadur</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
@@ -9783,11 +10111,6 @@ msgstr "Diskouez an darempredoù _ezlinenn"
 msgid "Show Transports"
 msgstr "Dorioù"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Treuzkasoù"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9860,32 +10183,22 @@ msgstr ""
 msgid "Pr_int status:"
 msgstr "Diskouez an eur:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Taolennadur"
+#: gajim/data/gui/exception_dialog.ui:45
+msgid ""
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
+msgstr ""
 
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:115
 #, fuzzy
 msgid "Report Bug"
 msgstr "_Diskleriañ ar Bug"
 
-#: gajim/data/gui/exception_dialog.ui:89
-msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
-msgstr ""
-
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Goulenn koumanantiñ"
-
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Nac'hañ"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
@@ -9893,17 +10206,12 @@ msgid ""
 msgstr ""
 "Nac'hañ aotre an darempred evit ma ne welo ket hag eñ oc'h kevreet pe get"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Oberoù"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 #, fuzzy
 msgid "Au_thorize"
 msgstr "_Aotren"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 #, fuzzy
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Aotren an darempred da welet hag emaon kevreet pe get"
@@ -9922,27 +10230,32 @@ msgstr ""
 msgid "Presets"
 msgstr "_Bezañs"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
 msgid "MUC server"
 msgstr "Sellerien"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Diwelus"
@@ -10055,11 +10368,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Darvoud"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10227,6 +10535,16 @@ msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 msgid "Mute Sounds"
 msgstr "Sonioù wav"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Penndibaboù"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Kuitaat"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Da:"
@@ -10630,14 +10948,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Kefluniañ ar webgaoz"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Flaperez Jabber"
@@ -10762,6 +11072,23 @@ msgid "Plugin manager"
 msgstr "échec lors de la publication de votre vCard"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "eus ar gont %s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Taolennadur"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
+
+#~ msgid "_Actions"
+#~ msgstr "_Oberoù"
+
+#, fuzzy
 #~ msgid "Start Chat..."
 #~ msgstr "_Kregiñ da flapiñ"
 
@@ -10929,69 +11256,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "Usage: /%s, cache les boutons de discussion."
 
 #, fuzzy
-#~ msgid "File is empty"
-#~ msgstr "Treug ar restr"
-
-#, fuzzy
-#~ msgid "File does not exist"
-#~ msgstr "Ce salon n'existe pas."
-
-#, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "_Hegerz"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "Diskouez an eur:"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Dianav"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "fazi"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Hini ebet"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Hini ebet"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Hini ebet"
-
-#, fuzzy
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "Hini ebet"
-
-#, fuzzy
-#~ msgid "?print_status:All"
-#~ msgstr "Diskouez an eur:"
-
-#, fuzzy
-#~ msgid "?print_status:None"
-#~ msgstr "Diskouez an eur:"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Hegerz"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "kont"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "stad"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "kemennadenn"
-
-#, fuzzy
-#~ msgid "?CLI:room"
-#~ msgstr "Digant"
-
-#, fuzzy
 #~ msgid "?CLI:nick"
 #~ msgstr "Lesanv"
 
@@ -11000,28 +11264,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "Ger-kuzh:"
 
 #, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Flapoù a-stroll"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Pellgargañ"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Kas"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Dianav"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Dianav"
-
-#, fuzzy
-#~ msgid "?Time:Unknown"
-#~ msgstr "Dianav"
-
-#, fuzzy
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr ""
 #~ "Implij DBus ha Notification-Daemon evit diskouez ar c'hemennadennoù-"
@@ -11280,13 +11522,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "_Kemennadenn"
 
 #, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Sil:"
-
-#~ msgid "Send"
-#~ msgstr "Envoyer"
-
-#, fuzzy
 #~ msgid "Last status: %s"
 #~ msgstr "Stad diwezhañ: %s"
 
@@ -11491,10 +11726,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "a zo aketus d'ar gaozeadenn"
 
 #, fuzzy
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Taolennadur</b>"
-
-#, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Anv an darempred"
 
@@ -12022,10 +12253,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgstr "Kefluniet eo bet ar gont-mañ e-barzh Gajim dija."
 
 #, fuzzy
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP : "
-
-#, fuzzy
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Arsavet eo bet an treuzkas gant ho tarempred"
 
@@ -12054,12 +12281,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la "
 #~ "troisième personne. (ex : /%s explose.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "War enaou emañ ar sifrañ"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Lazhet eo ar sifrañ"
-
 #~ msgid "_Retype Password:"
 #~ msgstr "_Adroit ho ker-kuzh"
 
diff --git a/po/ca.po b/po/ca.po
index 523381b14..fbcf2f0db 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2017-08-01 14:04+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -26,20 +26,20 @@ msgstr ""
 msgid "Error."
 msgstr ""
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -84,69 +84,69 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr ""
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr ""
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr ""
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr ""
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr ""
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr ""
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr ""
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 msgid "Open _Containing Folder"
 msgstr ""
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr ""
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr ""
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr ""
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr ""
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr ""
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -154,121 +154,121 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 msgid "Choose File to Send…"
 msgstr ""
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "Envia"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr ""
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 msgid "Gajim can not read this file"
 msgstr ""
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr ""
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 msgid "Save File as…"
 msgstr ""
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr ""
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr ""
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr ""
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr ""
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 msgid "Checking file…"
 msgstr ""
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 msgid "File error"
 msgstr ""
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr ""
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr ""
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr ""
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr ""
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr ""
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr ""
 
@@ -420,83 +420,114 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "?user status:_Disponible"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 msgid "Save Image as…"
 msgstr ""
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr ""
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr ""
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr ""
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr ""
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr ""
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr ""
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr ""
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr ""
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr ""
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Fitxer de Certificat de Client:"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Gestió de perfils de proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -539,13 +570,13 @@ msgid "_New Group Chat"
 msgstr ""
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr ""
 
@@ -557,7 +588,7 @@ msgstr ""
 msgid "Send Single _Message…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Envia Estat"
@@ -574,24 +605,24 @@ msgstr ""
 msgid "_Modify Transport"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 msgid "_Rename…"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Desbloquejar"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Bloca"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Esborra"
@@ -605,197 +636,217 @@ msgstr ""
 msgid "Send File..."
 msgstr "Envia un _fitxer..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Convida _Contactes"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Afegeix a llista de contactes"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Informació personal"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Historial"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Gestiona Sala"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Canvia Tema..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Configura Sala..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Destrueix Sala"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Canvia _Nick..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Afegeix aquesta sala a les adreces d'interès"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "Sol.licita Veu"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimitza en tancar"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Executa Comanda...."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Desconnecta"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Uneix-te al xat en grup"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 msgid "Add Contact..."
 msgstr ""
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 msgid "Profile"
 msgstr "Perfil"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 msgid "Discover Services"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 msgid "Send Single Message..."
 msgstr ""
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avançat"
+
+#: gajim/gui_menu_builder.py:737
 msgid "Archiving Preferences"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sincronitza els contactes"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Servidor:"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Administra"
+
+#: gajim/gui_menu_builder.py:744
 msgid "Send Server Message..."
 msgstr ""
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr ""
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr ""
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 msgid "Delete MOTD..."
 msgstr ""
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 msgid "No Accounts available"
 msgstr ""
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Comptes"
+
+#: gajim/history_manager.py:56
 msgid "Usage:"
 msgstr ""
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 msgid "Options:"
 msgstr ""
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr ""
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr ""
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr ""
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr ""
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr ""
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr ""
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -804,89 +855,89 @@ msgid ""
 "In case you click YES, please wait…"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 msgid "Exporting History Logs…"
 msgstr ""
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr ""
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr ""
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 msgid "This can not be undone."
 msgstr ""
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr ""
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 msgid "Retrieving profile…"
 msgstr ""
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr ""
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr ""
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr ""
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr ""
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr ""
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 msgid "Sending profile…"
 msgstr ""
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr ""
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr ""
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -902,10 +953,10 @@ msgstr ""
 msgid "JID: <i>%s</i>"
 msgstr ""
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "General"
@@ -991,35 +1042,35 @@ msgstr "<b>Si us plau ompli les dades del seu compte existent</b>"
 msgid "Please fill in the data of the contact you want to add"
 msgstr ""
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr ""
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr ""
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr ""
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr ""
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr ""
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 msgid "Error while adding transport contact"
 msgstr ""
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1027,55 +1078,55 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 msgid "A GTK+ XMPP client"
 msgstr ""
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Versió:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, python-format
 msgid "PyGObject Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 msgid "Current Developers"
 msgstr ""
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 msgid "Past Developers"
 msgstr ""
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr ""
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1084,12 +1135,12 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr ""
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1098,482 +1149,504 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr ""
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr ""
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 msgid "The nickname contains invalid characters."
 msgstr ""
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr ""
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr ""
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr ""
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Uneix-te al xat en grup"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Gestiona Sala"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr ""
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 msgid "Please choose a nickname"
 msgstr ""
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr ""
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 msgid "Wrong server"
 msgstr ""
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, python-format
 msgid "%s is not a groupchat server"
 msgstr ""
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr ""
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr ""
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 msgid "Start new Conversation"
 msgstr ""
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Grups de xat"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Afegeix un contacte nou"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr ""
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr ""
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr ""
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr ""
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "El Contacte ha entrat"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr ""
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr ""
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr ""
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr ""
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr ""
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr ""
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr ""
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr ""
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr ""
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr ""
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr ""
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr ""
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr ""
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr ""
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr ""
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr ""
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr ""
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr ""
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+msgid "Clear"
+msgstr ""
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtra:"
+
+#: gajim/dialogs.py:3568
+msgid "XML Input"
+msgstr ""
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "Envia"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr ""
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr ""
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr ""
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr ""
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Afegeix"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr ""
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr ""
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Your Archiving Preferences have been saved!"
 msgstr ""
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr ""
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 msgid "Error!"
 msgstr ""
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 msgid "Add JID"
 msgstr ""
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr ""
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr ""
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr ""
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr ""
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr ""
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr ""
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr ""
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr ""
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr ""
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr ""
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr ""
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr ""
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr ""
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr ""
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1597,425 +1670,460 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr ""
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+msgid "File Transfer"
+msgstr "Transferència de Fitxers"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+msgid "Encrypting file..."
+msgstr ""
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr ""
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr ""
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr ""
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr ""
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr ""
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 msgid "Invalid group chat JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 msgid "The group chat JID has not allowed characters."
 msgstr ""
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr ""
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr ""
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr ""
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr ""
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr ""
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Qualsevol membre pot veure el teu JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr ""
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr ""
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr ""
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr ""
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr ""
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr ""
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Transferència de Fitxers"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Transferència de Fitxers"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Mostra una llista de formats"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
 msgstr ""
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr ""
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr ""
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
 "%(message)s"
 msgstr ""
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr ""
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 msgid "File transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr ""
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr ""
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Entra-hi"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr ""
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr ""
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Grups de xat"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr ""
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 msgid "Authorization sent"
 msgstr ""
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr ""
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 msgid "Authorization removed"
 msgstr ""
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr ""
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2023,392 +2131,393 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr ""
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr ""
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr ""
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr ""
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr ""
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr ""
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr ""
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr ""
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr ""
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr ""
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
 "always seeing you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in them always seeing you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr ""
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr ""
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr ""
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr ""
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr ""
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr ""
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Canvia Missatge d'Estat"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr ""
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr ""
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 msgid "Configure Services…"
 msgstr ""
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr ""
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr ""
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr ""
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vida a"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr ""
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 msgid "Edit _Groups…"
 msgstr ""
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr ""
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr ""
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Desconnecta"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historial"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Gestor d'Històric"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr ""
 
-#: gajim/roster_window.py:5774
-msgid "Change Status Message…"
-msgstr "Canvia Missatge d'Estat..."
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 msgid "Show the application's version"
 msgstr ""
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 msgid "Show only critical errors"
 msgstr ""
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 msgid "Use defined profile in configuration directory"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 msgid "Set configuration directory"
 msgstr ""
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 msgid "Show all warnings"
 msgstr ""
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 msgid "How far back do you want to go?"
 msgstr ""
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexió"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr ""
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, python-format
 msgid "Downloaded %s Messages"
 msgstr ""
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2417,7 +2526,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2425,7 +2534,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2552,16 +2661,16 @@ msgstr ""
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr ""
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Escriu la teva contrasenya per al compte %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Desa la contrasenya"
 
@@ -2591,10 +2700,20 @@ msgstr ""
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Estat d'impressió:"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr ""
 
+#: gajim/config.py:1949
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Estat d'impressió:"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr ""
@@ -2658,11 +2777,11 @@ msgstr ""
 msgid "Custom port must be a port number."
 msgstr ""
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr ""
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2759,90 +2878,112 @@ msgstr ""
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr ""
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr ""
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr ""
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr ""
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr ""
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+msgid "?Noun:Download"
+msgstr ""
+
+#: gajim/tooltips.py:653
+msgid "?Noun:Upload"
+msgstr ""
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr ""
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr ""
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr ""
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr ""
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr ""
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+#, fuzzy
+msgid "?transfer status:Paused"
+msgstr "?user status:_Disponible"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr ""
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr ""
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr ""
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?user status:_Disponible"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Disponible per parlar"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Absent"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Ocupat"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr ""
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Desconnectat"
 
@@ -2891,120 +3032,124 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr ""
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Històric de converses"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr ""
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 msgid "_Change Status Message…"
 msgstr "_Canvia Missatge d'Estat..."
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr ""
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 msgid "_Manage Bookmarks…"
 msgstr ""
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr ""
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr ""
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr ""
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr ""
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr ""
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Nom del servidor:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Servidor:"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3155,56 +3300,62 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr ""
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr ""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr ""
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr ""
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr ""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr ""
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr ""
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 msgid "Invalid URL"
 msgstr ""
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3216,30 +3367,34 @@ msgstr[1] ""
 msgid "Write a message.."
 msgstr "Envia missatge"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr ""
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr ""
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+msgid "?Noun:Chats"
+msgstr ""
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr ""
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr ""
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr ""
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3248,261 +3403,265 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr ""
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr ""
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr ""
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, python-format
 msgid "<b>%s</b> is full"
 msgstr ""
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr ""
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr ""
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr ""
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 msgid "Group chat creation is not permitted."
 msgstr ""
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 msgid "Unable to join groupchat"
 msgstr ""
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr ""
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr ""
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr ""
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr ""
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr ""
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr ""
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr ""
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr ""
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr ""
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr ""
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr ""
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 msgid "Wrong passphrase"
 msgstr ""
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 msgid "Wrong OpenPGP passphrase"
 msgstr ""
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 msgid "Certificate Passphrase Required"
 msgstr ""
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid "Untrusted OpenPGP key"
 msgstr ""
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr ""
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 msgid "File Transfer Failed"
 msgstr ""
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr ""
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr ""
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr ""
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+msgid "Choose file to send"
+msgstr ""
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr ""
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr ""
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr ""
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr ""
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3510,7 +3669,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3522,15 +3681,15 @@ msgstr ""
 "Afegir aquest certificat a la llista de certificats confiables.\n"
 "Hash SHA1 del certificat:\n"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3545,44 +3704,44 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Uneix-te al xat en grup"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr ""
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr ""
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3590,40 +3749,40 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr ""
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr ""
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 msgid "OpenPGP key expired"
 msgstr ""
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 
@@ -3692,6 +3851,10 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+msgid "Open"
+msgstr ""
+
 #: gajim/dialog_messages.py:33
 msgid "You can not start a new conversation unless you are connected."
 msgstr ""
@@ -3720,7 +3883,7 @@ msgstr ""
 msgid "The form is not filled correctly."
 msgstr ""
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -3841,6 +4004,51 @@ msgid ""
 "Link-local messaging might not work properly."
 msgstr ""
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+msgid "Could not request upload slot"
+msgstr ""
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+msgid "Could not open file"
+msgstr ""
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+msgid "Could not upload file"
+msgstr ""
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+msgid "For the choosen encryption is no encryption method available"
+msgstr ""
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr ""
@@ -3865,7 +4073,17 @@ msgstr ""
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Comptes"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Fes ús d'Agent G_PG"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr ""
 
@@ -3886,6 +4104,11 @@ msgstr ""
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "Esborra"
+
 #: gajim/accounts_window.py:387
 msgid "Rename account label"
 msgstr ""
@@ -4076,285 +4299,309 @@ msgstr "Canviar contrasenya"
 msgid "Login Options"
 msgstr ""
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr ""
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr ""
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr ""
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr ""
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "Compte"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 msgid "Changes the status of account(s)"
 msgstr ""
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+msgid "?CLI:status"
+msgstr ""
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr ""
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "missatge"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr ""
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr ""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 msgid "Changes the priority of account(s)"
 msgstr ""
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Priori_tat:"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr ""
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 msgstr ""
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
 "and account. If you want to only set the latter, set OpenPGP key to \"\"."
 msgstr ""
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr ""
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr ""
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr ""
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr ""
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr ""
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr ""
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr ""
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr ""
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr ""
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr ""
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr ""
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr ""
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr ""
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr ""
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr ""
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr ""
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr ""
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr ""
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr ""
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr ""
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr ""
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr ""
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr ""
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr ""
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4363,14 +4610,14 @@ msgid ""
 "Command is one of:\n"
 msgstr ""
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4542,11 +4789,6 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "Fusiona comptes"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4568,52 +4810,52 @@ msgstr ""
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s han entrat"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr ""
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr ""
 
@@ -5291,273 +5533,281 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr ""
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr ""
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr ""
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 msgid "client_id for OAuth 2.0 authentication."
 msgstr ""
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr ""
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr ""
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr ""
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr ""
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr ""
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr ""
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr ""
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr ""
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr ""
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr ""
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr ""
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr ""
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr ""
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr ""
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr ""
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr ""
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr ""
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr ""
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr ""
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr ""
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr ""
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr ""
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr ""
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 msgid "Tor"
 msgstr ""
 
@@ -5634,36 +5884,49 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr ""
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr ""
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr ""
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr ""
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr ""
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr ""
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr ""
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr ""
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr ""
@@ -5673,11 +5936,11 @@ msgstr ""
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr ""
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -5686,233 +5949,233 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr ""
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr ""
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr ""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr ""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr ""
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr ""
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr ""
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr ""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr ""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr ""
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr ""
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6767,252 +7030,276 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr ""
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr ""
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr ""
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr ""
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "Ocupat"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr ""
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "?user status:_Disponible"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr ""
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr ""
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "Desconnectat"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr ""
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr ""
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr ""
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr ""
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr ""
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr ""
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr ""
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr ""
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr ""
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderadors"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr ""
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr ""
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr ""
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr ""
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr ""
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr ""
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 msgid "is composing a message…"
 msgstr ""
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr ""
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr ""
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, python-format
 msgid "from room %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, python-format
 msgid "from %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Voldria afegir-te a la meva llista de contactes."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr ""
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 msgid "Error loading image"
 msgstr ""
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "missatge"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr ""
 
@@ -7042,43 +7329,43 @@ msgid ""
 "Try reading %(url)s"
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7318,6 +7605,11 @@ msgstr "_Bandeja"
 msgid "_Add to Roster"
 msgstr "_Afegeix a llista de contactes"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Executa Comanda...."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -7591,11 +7883,11 @@ msgstr "Sobre l'aplicació"
 msgid "Con_tinue"
 msgstr "Con_tinua"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Cancel·la"
@@ -7604,33 +7896,33 @@ msgstr "_Cancel·la"
 msgid "_Open Containing Folder"
 msgstr "_Obre Carpeta Contenidora"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Transferències de fitxers"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "llista de trasferència de fitxers"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr ""
 "Una llista de les transferències de fitxers actives, completades i aturades"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Neteja"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Esborra de la llista les transferències completades, cancel.lades o fallides"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Esborra transferència de fitxer de la llista."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -7638,32 +7930,36 @@ msgstr ""
 "Aquesta acció esborra una única transferència de fitxer de la llista. Si "
 "està activa, primer s'atura i després s'esborra."
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Cancel.la la transferència seleccionada i esborra els fitxers incomplets."
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Cancel.la la transferència de fitxer."
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Cancel.la la transferència de fitxer seleccionada."
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+msgid "_Close"
+msgstr ""
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Amaga la finestra"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifica'm quan una transferència de fitxer ha acabat"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Quan una transferència de fitxer acabi mostra una notificació (popup)"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Mostra una llista de transferències de fitxers entre tu i els altres"
 
@@ -7672,7 +7968,7 @@ msgid "Register to"
 msgstr ""
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr ""
 
@@ -7702,20 +7998,20 @@ msgstr "Tipus de lletra"
 msgid "Clear formatting"
 msgstr "Neteja el format"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Mostra una llista d'emoticones (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Connexió"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Mostra una llista d'emoticones (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "Tipus d'esdeveniment"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "Descripció d'esdeveniment"
 
@@ -7767,7 +8063,7 @@ msgstr "<b>0</b>"
 msgid "<b>#</b>"
 msgstr "<b>#</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -8444,10 +8740,6 @@ msgstr ""
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr ""
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avançat"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Comença Xat"
@@ -8685,7 +8977,7 @@ msgid "_Open Email Composer"
 msgstr "_Obre Editor de Correu"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "Inicia Xat"
 
@@ -8727,6 +9019,10 @@ msgstr "Preferència"
 msgid "Default:"
 msgstr "Per defecte:"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Afegeix un contacte nou"
@@ -8752,6 +9048,16 @@ msgstr "Sobrenom:"
 msgid "_Group:"
 msgstr "_Grup:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID d'_Usuari:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Sobrenom:"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr "Escull un grup o escriu-ne un de nou"
@@ -8788,6 +9094,10 @@ msgstr ""
 "Has d'estar connectat al transport per a poder\n"
 "afegir un contacte des d'aquest protocol."
 
+#: gajim/data/gui/roster_window.ui:61
+msgid "Change Status Message…"
+msgstr "Canvia Missatge d'Estat..."
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Estat d'ànim:</b>"
@@ -9002,10 +9312,10 @@ msgstr "_Executa Comanda...."
 msgid "_Verify"
 msgstr "_Verifica"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Comptes"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Descripció</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
@@ -9027,10 +9337,6 @@ msgstr "Mostra Contactes Actius"
 msgid "Show Transports"
 msgstr "Mostra Transports"
 
-#: gajim/data/gui/application_menu.ui:32
-msgid "File Transfer"
-msgstr "Transferència de Fitxers"
-
 #: gajim/data/gui/application_menu.ui:43
 msgid "Help"
 msgstr "Ajuda"
@@ -9095,48 +9401,35 @@ msgstr "Minimitza quan es connecta automàticament"
 msgid "Pr_int status:"
 msgstr "Estat d'impressió:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-msgid "Exception"
-msgstr "Excepció"
-
-#: gajim/data/gui/exception_dialog.ui:44
-msgid "Report Bug"
-msgstr "Informa de l'error"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
+#, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "S'ha detectat un error de programació.\n"
 "Probablement no és fatal, però caldria\n"
 "informar-ne els desenvolupadors."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr ""
+#: gajim/data/gui/exception_dialog.ui:115
+msgid "Report Bug"
+msgstr "Informa de l'error"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr ""
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Accions"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr ""
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
 
@@ -9154,11 +9447,11 @@ msgstr ""
 msgid "Presets"
 msgstr "Missatges preconfigurats:"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Convida Amics!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
@@ -9166,15 +9459,20 @@ msgstr ""
 "Estàs entrant a un xat de grup.\n"
 "Selecciona els contactes que vols convidar"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Si us plau selecciona un servidor MUC."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Servidor MUC"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Con_vida"
 
@@ -9282,10 +9580,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-msgid "Clear"
-msgstr ""
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -9436,6 +9730,16 @@ msgstr ""
 msgid "Mute Sounds"
 msgstr ""
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferències"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "Surt"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr ""
@@ -9814,14 +10118,6 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr ""
@@ -9941,12 +10237,19 @@ msgstr "Historial"
 msgid "Plugin manager"
 msgstr ""
 
+#, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "Fusiona comptes"
+
+#~ msgid "Exception"
+#~ msgstr "Excepció"
+
+#~ msgid "_Actions"
+#~ msgstr "_Accions"
+
 #~ msgid "jid"
 #~ msgstr "jid"
 
-#~ msgid "Nickname:"
-#~ msgstr "Sobrenom:"
-
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
@@ -10036,9 +10339,6 @@ msgstr ""
 #~ msgid "Administration operations"
 #~ msgstr "Operacions d'Administració"
 
-#~ msgid "_Client Cert File:"
-#~ msgstr "Fitxer de Certificat de Client:"
-
 #~ msgid "Browse..."
 #~ msgstr "Navega..."
 
@@ -10105,9 +10405,6 @@ msgstr ""
 #~ msgid "Choose _Key..."
 #~ msgstr "Escull Clau..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Fes ús d'Agent G_PG"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -10202,6 +10499,3 @@ msgstr ""
 
 #~ msgid "save"
 #~ msgstr "desa"
-
-#~ msgid "?user status:_Available"
-#~ msgstr "?user status:_Disponible"
diff --git a/po/cs.po b/po/cs.po
index 99fed40a6..990e467cd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2010-01-22 14:35+0100\n"
 "Last-Translator: Petr Menšík <pihhan@cipis.net>\n"
 "Language-Team: <>\n"
@@ -41,20 +41,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Chyba."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Opravdu odeslat soubor?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Pokud odešlete soubor %s, tak bude znát vaše skutečné Jabber ID."
@@ -110,70 +110,70 @@ msgstr "Čas"
 msgid "Progress"
 msgstr "Průběh"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Velikost: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Vy"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Příjemce: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uloženo do: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Přenos soubor dokončen"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Otevřít obsahující složku"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Přenos souboru zrušen"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Spojení s protistranou se nepodařilo navázat."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Příjemce: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová zpráva: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Přenos souboru zastaven"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -181,72 +181,72 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Vyber soubor k odeslání..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "Ode_slat"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Popis:"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nemohu přepsat existující soubor \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Soubor tohoto jména již existuje a ty nemáš oprávnění k jeho přepsání."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Adresář \"%s\" není zapisovatelný"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáš oprávnění k vytváření souborů v tomto adresáři."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Uložit jako..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
@@ -255,56 +255,56 @@ msgstr "Popis: %s"
 # #, python-format
 # msgid "Description: %s"
 # msgstr "Popis: %s"
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Odesílám profil..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Chyba přenosu souboru"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Soubor: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Jméno: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pauza"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Pokračovat"
 
@@ -463,90 +463,121 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Je potřeba python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Připojen"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Vlastnost"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Chyba parsování souboru:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Rozšíření není podporováno"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Obrázek nelze uložit ve formátu %(type)s. Uložit jako %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Uložit obrázek jako..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Má"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Client:Neznámý"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Neznámý"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Time:Neznámý"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vztah</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr "Tento kontakt zajímá Váš stav, ale Vy se nezajímate o jeho stav"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr "Vy se zajímáte o stav kontaktu, ale on se nezajímá o Váš stav"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Vy i kontakt se zajímáte o stav toho druhého"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Vy i kontakt se zajímáte o stav toho druhého"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekáte na odpověď kontaktu na vaši žádost o autorizaci"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Není zde žádný nevyřízený požadavek."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Všechny soubory"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Uklízím"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Spravovat profily Proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -589,13 +620,13 @@ msgid "_New Group Chat"
 msgstr "_Nová diskuze"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Není v Rosteru"
 
@@ -608,7 +639,7 @@ msgstr "Rád bych si Vás přidal(a) do svého seznamu"
 msgid "Send Single _Message…"
 msgstr "Odeslat jednoduchou _zprávu"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Poslat vlastní stav"
@@ -626,25 +657,25 @@ msgstr "Transporty"
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Přejmenovat"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Odblokovat"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Blokovat"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Odst_ranit"
@@ -658,212 +689,232 @@ msgstr "Informace o kontaktu"
 msgid "Send File..."
 msgstr "Odeslat _Soubor"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Pozvat kontakt"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "Přid_at do Seznamu"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "Audio / Video"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "Velikost videa"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Informace o kontaktu"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historie"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Spravuj Místnost"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Změnit _předmět"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Nastavit _místnost"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Zničit místnost"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Změ_nit přezdívku"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Přidat tuto místnost do záložek"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Hlas"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Uložené stavy:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimalizovat při zavření"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "Spustit _příkaz..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Odpojit"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "Přid_at kontakt..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "soubor"
 
 # FIXME: chtelo by to cesky vyraz pro service discovery
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Prohlížet služby"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Odeslat jednoduchou _zprávu..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Rozšířené"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Nastavení"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synchronizovat"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Správce"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "Ode_slat zprávu serveru"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Nastavit MOTD"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Upravit MOTD"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Smazat MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Žádný účet není dostupný"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Účty"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "zpráva"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Smajlíky:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Zpráva"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Předmět"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Chcete pročistit databázi? (VELICE NEDOPORUČUJEME POKUD GAJIM BĚŽÍ)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -878,100 +929,100 @@ msgstr ""
 "\n"
 "V případě kliknutí na ANO prosím vyčkejte..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Chyba Databáze"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Exportuji záznamy historie..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s v %(time)s řekl(a): %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Vážně chcete smazat vybranou zprávu?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Vážně chcete smazat všechny záznamy historie vybraného kontaktu?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Tato služba nebyla nalezena"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Zrušit ověření"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vážně chcete smazat vybranou zprávu?"
 msgstr[1] "Vážně chcete smazat vybrané zprávy?"
 msgstr[2] "Vážně chcete smazat vybrané zprávy?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Tato operace je nevratná."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Stahuji profil..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informace o kontaktu"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formát: RRRR-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informace přijata"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Bez opětovného připojení nemůžete zveřejnit Vaše osobní údaje."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Odesílám profil..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informace NEBYLY zveřejněny"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -988,10 +1039,10 @@ msgstr "Jméno kontaktu: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Obecné"
@@ -1078,36 +1129,36 @@ msgstr "Prosím vyplňte údaje kontaktu, který chcete přidat do účtu %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Chyba při přidávání služby. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1115,63 +1166,63 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "GTK+ Jabber klient"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ verze: "
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK verze: "
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Aktivní vývojáři:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Vysloužilí vývojáři:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Poslední, nikoliv nejmenší, poděkování patří všem správcům instalačních "
 "balíčků."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Petr Menšík <pihhan@seznam.cz>\n"
 "scippio <scippio@berounet.cz>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1182,12 +1233,12 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Nezabezpečené Spojení"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1198,279 +1249,303 @@ msgstr ""
 "Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
 "PyOpenSSL. Jste si jisti, že to chcete udělat?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ano, chci se připojit nezabezpečeně"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Žádost o autorizaci"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Žádost o autorizaci na účtu %(account)s od %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Připojit se do diskuze"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Neplatná místnost"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Vytvořte vaše nové téma."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Neplatné JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Nesprávné uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Tohle není diskuze"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Jméno"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Tento účet není připojen k serveru"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Pokračování v rozhovoru"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Nová diskuze"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Přidat nový kontakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nová zpráva"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Od %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím ujistěte se že jste připojen s účtem \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Není možné poslat zprávu kontaktu %s, takové JID není platné."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Uklízím"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtr:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Vstup XML</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "Ode_slat"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "přidat"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "upravit"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "odebrat"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1479,28 +1554,28 @@ msgstr ""
 "<b>%(jid)s</b> by chtěl(a), aby jste </b>%(action)s</b> některé kontakty z "
 "vašeho rosteru."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Přidat"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Upravit"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Smazat"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Skupiny"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s mi doporučila přidat si Vás od mého rosteru."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1508,7 +1583,7 @@ msgstr[0] "Přidáno %s kontaktů"
 msgstr[1] "Přidáno %s kontaktů"
 msgstr[2] "Přidáno %s kontaktů"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1516,179 +1591,179 @@ msgstr[0] "Odstraněno %s kontaktů"
 msgstr[1] "Odstraněno %s kontaktů"
 msgstr[2] "Odstraněno %s kontaktů"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Nastavení"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Služba vrátila chybu."
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Chyba"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Soukromý seznam <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Nastavení Soukromí"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s, typ: %(type)s, hodnota: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upravit pravidlo</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Přidat pravidlo</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Neplatné jméno seznamu"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte zadat jméno pro vytvoření privacy listu."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Jste pozván do diskuze"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete přijmout pozvání?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Obrázky"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Vyberte obrázek"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Všechny soubory"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "audio a video"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "audio"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "video"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s chce zahájit %(type) sezení. Chcete na volání odpovědět?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "pro účet %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1712,67 +1787,95 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Přenosy souborů"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E Šifrování vypnuto"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s se přejmenoval na %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je nyní %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Už nejsi v místnosti \"%(room)s\" nebo \"%(nick)s\" odešel(a)."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Uložení metakontaktů není podporováno serverem"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Likviduji: %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1781,273 +1884,283 @@ msgstr ""
 "Místnost bude s konečnou platností zničena.\n"
 "Můžete specifikovat důvod zničení:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Také můžete specifikovat náhradní místo:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "a autentizovaný"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "a NEautentizovaný"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "Šifrování %(type)s %(status)s aktivní %(authenticated)s.\n"
 "Váš rozhovor %(logged)s zaznamenáván."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Rozhovor s"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Pokračování v rozhovoru"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s nastavil předmět na %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Každý návštěvník uvidí váš úplný JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Místnost nyní zobrazuje nedostupné členy"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "místnost nyní nezobrazuje nedostupné členy"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávání historie je zapnuto"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávání historie je vypnuto"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Místnost není anonymní"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Místnost je částečně anonymní"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Místnost je plně anonymní"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Zaznamenávání historie je povoleno"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Nová místnost byla vytvořena"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Server přidělil nebo změnil název vaší místnosti"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
 
 # FIXME: preklad pro ban? zabanovani je hnusne
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s byl zakázán od %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s byli vyhozeni z místnosti: %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "Příslušnost:"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "nastavení místnosti se změnilo na vstup pouze členům"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "vypnout systém"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(actor)s nastavil(a) vztah %(nick)s na %(affiliation)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Vztah %(nick)s byl nastaven na %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(actor)s nastavil(a) postavení %(nick)s na %(role)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Postavení %(nick)s bylo nastaveno na %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Pokud zavřete toto okno, budete odpojen(a) z této místnosti."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Přenosy souborů"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Přenos souboru dokončen"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Zobrazit seznam formátování"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Tento kontakt nepodporuje přenos souborů."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s stav: %(state)s, důvod: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskuze %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Sezení bylo zrušeno"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sezení NEBUDE logováno"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Toto sezení je šifrované"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr "a BUDE zaznamenáváno"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr "a NEBUDE zaznamenáváno"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "Kontakt nebyl ověřen. Klikněte na tlačítko štítu pro více informací."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E Šifrování vypnuto"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Právě jsi obdržela novou zprávu od \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Pokud zavřete toto okno a historie je vypnutá, tato zpráva bude ztracena."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2056,7 +2169,7 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2065,96 +2178,96 @@ msgstr ""
 "Nepodařilo se dešifrovat zprávu od %s\n"
 "Možná je falešná."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je nyní %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Přenosy souborů"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Velikost: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Přijmi"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Vstoupit"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Protějšek zastavil přenos"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Chyba při čtení souboru"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Diskuze"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transporty"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizace byla odeslána"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho stav."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizace byla zrušena"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG je nepoužitelné"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2162,11 +2275,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2175,28 +2288,28 @@ msgstr ""
 "si jistý(á), že se chcete stát neviditelným(ou)?"
 
 # FIXME: mozna nejak lepe? :/
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "nesynchronizováno"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Opravdu ukončit Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Opravdu chcete ukončit Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Vždy zavřít Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Zrušit přenos souboru"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
@@ -2205,11 +2318,11 @@ msgstr ""
 "Pokud chcete teď odejít, veškeré právě probíhající přenosy budou zastaveny. "
 "Opravdu chcete odejít?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2217,16 +2330,16 @@ msgstr ""
 "Zprávy bude možné číst později, pokud máte povolený záznam historie a "
 "kontakt je v rosteru."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Musíš si je přečíst před smazáním transportu."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2234,11 +2347,11 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2247,11 +2360,11 @@ msgstr ""
 "Už více nebudete moci posílat ani přijímat zprávy od kontaktů z těchto "
 "transportů:%s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Chystáte se zablokovat kontakt. Určitě chcete pokračovat?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2260,56 +2373,56 @@ msgstr ""
 "Tento kontakt vás uvidí jako odpojeného a nebudete dostávat zprávy, které "
 "vám pošle."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Odstranit také všechny kontakty v této skupině z Vašeho rosteru"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude smazán z Vašeho rosteru"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Chystáte se smazat \"%(name)s\" (%(jid)s) z vašeho rosteru.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2318,11 +2431,11 @@ msgstr ""
 "Smazáním těchto kontaktů:%s\n"
 "také zrušíte autorizaci. Kontakty Vás tak vždy uvidí jako odpojeného."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2331,15 +2444,15 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Chci aby tento kontakt věděl o mém stavu i po odstranění"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty budou smazány z Vašeho rosteru"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2348,13 +2461,13 @@ msgstr ""
 "Smazáním těchto kontaktů:%s\n"
 "také zrušíte autorizaci. Kontakty Vás tak vždy uvidí jako odpojeného."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Chystáte se poslat vlastní stav. Určitě chcete pokračovat?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2363,25 +2476,25 @@ msgstr ""
 "Tento kontakt váš dočasně uvidí jako %(status)s, ale pouze do první změny "
 "vašeho stavu. Poté uvidí váš globální stav."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2390,12 +2503,12 @@ msgstr ""
 "Tvůj server nepodporuje ukládání metakontaktů. Tyto informace nebudou při "
 "přístím připojení uloženy."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2405,11 +2518,11 @@ msgstr ""
 "jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v "
 "transportech."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2417,183 +2530,183 @@ msgstr[0] "Chcete poslat %s tento soubor:"
 msgstr[1] "Chcete poslat %s tyto soubory:"
 msgstr[2] "Chcete poslat %s tyto soubory:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Odeslat %s %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Udělej %s a %s metakontaktem"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Udělej %s a %s metakontaktem"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Zveřejnit hudbu"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "_Nastavit služby..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maximalizovat Vše"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Upravit _skupiny"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "Odst_ranit"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Znovu připojit"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Odpojit"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historie"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Připojit se do diskuze"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "Z_měnit popis stavu"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Zobrazit událost v rosteru"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor rozšířeného nastavení"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Nastavení místnosti"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Zobrazit všechny čekající _události"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Připojuji se"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Přeposlat nepřečtené zprávy"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2602,7 +2715,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2610,7 +2723,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2750,16 +2863,16 @@ msgstr "Smajlíci byly vypnuty"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Uložit heslo"
 
@@ -2791,10 +2904,18 @@ msgstr "Odstranit účet _pouze z Gajimu"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Všechny"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Pouze při vstupu a výstupu"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Žádný"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Nová diskuze"
@@ -2861,11 +2982,11 @@ msgstr "Neplatný záznam"
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certifikát je již v souboru"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Tento certifikát je již v souboru %s, takže nebude znova přidán."
@@ -2969,90 +3090,113 @@ msgstr "Zvýraznění zprávy v diskuzi"
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s této diskuze"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Žádná"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Člen"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Správce"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Vlastník"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr "[blokováno]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr "[minimalizováno]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Spojeno"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Odpojenol"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Stáhnout"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Nahrát"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Typ: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:Pozastaveno"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Stav: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?transfer status:Pozastaveno"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Pryč"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Nerušit"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Nedostupný"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Odpojen"
 
@@ -3101,125 +3245,129 @@ msgstr "(Žádný)"
 msgid "Hidden"
 msgstr "Skryté"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historie rozhovorů s %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historie konverzace"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Chyba disku"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je nyní %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Chyba: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Chyba"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je nyní %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je nyní %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Z_měnit popis stavu"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Spravovat záložky"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "v _rosteru"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Zobrazit _Seznam"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nelze nahrát idle modul"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Neviditelnost není podporována"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "Toto pole je povinné"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Počítač: "
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Vlastnosti serveru"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Server odpověděl: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3377,7 +3525,7 @@ msgstr "_Žádat autorizaci"
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3385,52 +3533,58 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno \n"
 "po posledním čtení této diskuze"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "_Konec"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akce pro \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chybí \"%s\" a není to WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Neplatné JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3443,30 +3597,35 @@ msgstr[2] "před %i dny"
 msgid "Write a message.."
 msgstr "Nová soukromá zpráva"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Chystáte se zavřít několik panelů"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Opravdu je chcete všechny zavřít?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Diskuze"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Zprávy"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3478,108 +3637,108 @@ msgstr ""
 "zaregistrována někým jiným.\n"
 "Níže vyber jinou přezdívku:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Vždy při konfliktu použij tuto přezdívku."
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Chcete přijmout tuto žádost na účtě %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizace pro %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Pro připojení do místnosti %s je vyžadováno heslo. Zadejte, prosím."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Písmo</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Máš zakázán přístup do diskuze %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Diskuze %s neexistuje."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Diskuze %s neexistuje."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Vytváření místností není povoleno."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Musí být použita přezdívka, jež máte zaregistrovánu v diskuzi %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nejsi v seznamu členů diskuze %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Žádost o autorizaci"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Přihlížející"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3588,31 +3747,31 @@ msgstr ""
 "Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
 "Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Autorizace zrušena"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3621,36 +3780,36 @@ msgstr ""
 "Nastavily jste Gajim aby používal GPG agenta, ale žádný GPG agent není "
 "spuštěný nebo vrátil chybné heslo.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Nesprávné heslo"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Nesprávné heslo"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Platnost certifikátu vypršela"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Zadej heslo GPG klíče pro účet %(keyid)s (účet %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3659,96 +3818,101 @@ msgstr ""
 "GPG klíč použitý k šifrování rozhovoru není důvěryhodný. Opravdu chcete "
 "šifrovat tuto zprávu?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Přenos souboru dokončen"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Vyber soubor k odeslání..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Nepodařilo se dešifrovat zprávu"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Konflikt Zdrojů"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Už jsi připojen(a) k tomuto účtu se stejným zdrojem. Prosím zadej nový"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce zahájit hlasový rozhovor. "
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Žádost o hlasový rozhovor"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Chyba ověřování SSL certifikátu"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3758,7 +3922,7 @@ msgstr ""
 "Chyba při ověřování SSL vertifikátu na vašem jabber serveru: %(error)s\n"
 "Chcete se přesto připojit?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3771,15 +3935,15 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovat tuto chybu certifikátu."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3800,7 +3964,7 @@ msgstr ""
 "\n"
 "Chcete se stále připojit a aktualizovat otisk certifikátu?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3808,7 +3972,7 @@ msgstr ""
 "Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
 "PyOpenSSL. Jste si jisti, že to chcete udělat?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3817,16 +3981,16 @@ msgstr ""
 "Chystáte se poslat vaše heslo nezabezpečeným spojením. Jste si jistý(á), že "
 "to skutečně chcete udělat?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Tohle není diskuze"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3834,7 +3998,7 @@ msgstr ""
 "Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci "
 "vypnuty "
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3843,11 +4007,11 @@ msgstr ""
 "Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci "
 "vypnuty "
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Tohle není diskuze"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3856,41 +4020,41 @@ msgid ""
 msgstr ""
 
 # FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "výchozí"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Zadej heslo GPG klíče pro účet %(keyid)s (účet %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG klíč vypršel"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Váš GPG klíč vypršel, k %s budete připojen(a) bez OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
@@ -3963,6 +4127,11 @@ msgstr "- zprávy budou zaznamenány"
 msgid "- messages will not be logged"
 msgstr "- zprvý nebudou zaznamenány"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3994,7 +4163,7 @@ msgstr "Neplatná místnost"
 msgid "The form is not filled correctly."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Neviditelný"
 
@@ -4123,6 +4292,57 @@ msgstr ""
 "%s\n"
 "Zasílání lokálních zpráv nemusí fungovat správně."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Nepodařilo se spustit lokální službu"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nezdařilo se načtení obrázku"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Služba vrátila chybu."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Nezdařilo se načtení obrázku"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "E2E Šifrování vypnuto"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Spojení není dostupné"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Téma"
@@ -4148,7 +4368,17 @@ msgstr "Nemůžete smazat právě používané téma"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Spojené účty"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Použít GPG _Agenta"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
@@ -4170,6 +4400,11 @@ msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "Odst_ranit"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4363,51 +4598,65 @@ msgstr "Změnit heslo"
 msgid "Login Options"
 msgstr "_Smajlíky:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus není přítomna na tohto stroji nebo modul pythonu chybí"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Zobrazí nápovědu pro konkrétní příkaz"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "příkaz"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "zobraz nápovědu k příkazu"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Zobrazí nebo skryje okno Seznamu"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Vytiskne seznam všech kontaktů v rosteru. Každý kontakt se objeví na "
 "samostatném řádku"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "účet"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "zobraz pouze kontakty zadaného účtu"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše seznam registrovaných účtů"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Změní stav účtu nebo účtů"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "stav"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4415,11 +4664,17 @@ msgid ""
 msgstr ""
 "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "zpráva"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "text stavu"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4427,16 +4682,21 @@ msgstr ""
 "změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
 "účtů které mají povolenu volbu \"sync with global status\" "
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Změní prioritu jednoho nebo více účtů"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "priorita"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "priorita vámi přidělená účtu"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4445,7 +4705,7 @@ msgstr ""
 "změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
 "účtů které mají povolenu volbu \"sync with global status\" "
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4455,29 +4715,29 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostě 'OpenPGP key' na ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "Tělo zprávy"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "pokud bude uvedeno, zpráva bude zašifrována tímto veřejným klíčem"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4487,120 +4747,120 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostě 'OpenPGP key' na ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "předmět"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "předmět zprávy"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Poslat novou zprávu do diskuze ke které jste připojeni."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID diskuze do které přijde zpráva"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o účtu"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Jméno účtu"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "soubor"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Vypíše všechna nastavení a jejich hodnoty"
 
 # FIXME: opravit, pokud je mozne prekladat i key & value
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'klíč' je jméno volby, 'hodnota' je hodnota která se nastavuje"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Smaže položku nastavení"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "klíč"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "jméno volby, která bude smazána"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuální nastavení do souboru .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "pokud uvedeno, kontakt bude vzít ze seznamu kontaktů pro tento účet"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vrátí aktuální stav (globální, pokud není uveden účet)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vrací aktuální popis stavu (globální, pokud není uveden účet)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Vrací počet nepřečtených zpráv"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Poslat vlastní XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML k odeslání"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4609,17 +4869,17 @@ msgstr ""
 "Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
 "ze všech účtů"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Změnit stav"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Přezdívka kterou chete použít"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4628,19 +4888,19 @@ msgstr ""
 "Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
 "ze všech účtů"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Zkontrolujte, zda Gajim již běží."
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Zobrazí nebo skryje okno ipythonu"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4649,15 +4909,15 @@ msgstr ""
 "'%s' není ve vašem Seznamu.\n"
 "Prosím uveďte účet, přes který bude odeslána zpráva."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Vypadá to, že Gajim neběží. Proto nemůžete použít gajim-remote"
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4666,16 +4926,16 @@ msgstr ""
 "Použití: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4686,7 +4946,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4695,7 +4955,7 @@ msgstr ""
 "Příliš mnoho parametrů. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4869,11 +5129,6 @@ msgstr "Konec týdne"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP účet %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4897,52 +5152,52 @@ msgstr "Místnost byla zničena"
 msgid "You can join this room instead: %s"
 msgstr "Můžete se připojit do této místnosti: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznámá SSL chyba: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová jednoduché zpráva od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová soukromá zpráva z místnosti %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Změnil(a) stav"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se přihlásil"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se odhlásil"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Není v rosteru"
 
@@ -5761,69 +6016,65 @@ msgstr "Povolit ESessions šifrování pro tento účet."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Má se Gajim automaticky připojovat šifrovaným spojením je-li to možné?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Řazený seznam (oddělený mezerami) spojení, která má Gajim zkusit. Možnosti "
-"jsou: tls, ssl nebo plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobrazit varování před použitím standartní SSL knihovny."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mezerami oddělovaný seznam ssl chyb, které se mají ignorovat."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Při neaktivitě odeslán bílý znak"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping zaslán při neaktivitě"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5832,11 +6083,11 @@ msgstr ""
 "Kolik sekund se má čekat na odpověď pingu před tím, než se znovu pokusit o "
 "připojení."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5844,32 +6095,32 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve "
 "volbě pro přenos souborů file_transfer_proxies."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Odpověď na doručení žádosti"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Poslat žádost"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s Vám chce poslat soubor."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5877,150 +6128,160 @@ msgstr ""
 "Pokud sestavuji šifrované sezení, má Gajim přepokládat povolení "
 "zaznamenávání zpráv?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anonymní autentizace"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anon_ymní autentizace"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anon_ymní autentizace"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr "Kolik řádek požadovat od serveru při připojení k diskuzi."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr "Kolik minut zpátky do historie při připojení k diskuzi."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spím"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Jím"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Pracuji"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Venku"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6028,27 +6289,27 @@ msgstr ""
 "Zvuk, který bude přehrán, pokud zpráva diskuze obsahuje jedno ze slov v "
 "muc_highlight_words, nebo když obsahuje Vaši přezdívku."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Přehraný zvuk při příchodu jakékoliv MUC zprávy."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "zelený"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "potraviny"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "člověk"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "mariňák"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Příjemce"
@@ -6127,37 +6388,50 @@ msgstr "Všechny nepřečtené zprávy byly přeposlány."
 msgid "Forward unread message then disconnect"
 msgstr "Přeposlat nepřečtené zprávy"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Soubor je prázdný"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Soubor neexistuje"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "vytvářím databázi historie"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Odeslat %s %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je soubor, ale měl by být adresář"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je adresář, ale měl by to být soubor"
@@ -6167,11 +6441,11 @@ msgstr "%s je adresář, ale měl by to být soubor"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "azurová"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "převádím záznamy historie k použítí indexů"
 
@@ -6180,188 +6454,188 @@ msgstr "převádím záznamy historie k použítí indexů"
 msgid "%s is not a valid loglevel"
 msgstr "%s není platný loglevel"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Nepodařilo se získat certifikát vydavatele"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Nepodařilo se získat certifikát CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodařilo se dešifrovat podpis certifikátu"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodařilo se dešifrovat podpis CRL certifikátu"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Nepodařilo se dešifrovat veřejný klíč vydavatele"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Chyba podpisu certifikátu"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Chyba podpisu CRL certifikátu"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Certifikát není správný"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL certifikát není správný"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "Platnost CRL certifikátu vypršela"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Chyba certifikátu v poli: platnost před"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Chyba certifikátu v poli: platnost po"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Chyba CRL certifikátu v poli: poslední aktualizace"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Chyba CRL certifikátu v poli: příští aktualizace"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Sám sebou podepsaný certifikát"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Sám sebou podepsaný certifikát v certifikačním řetězci "
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodařilo se získat certifikát lokálního vydavatele"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Nepodařilo se ověřit první certifikát"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Certifikační řetězec je přiliš dlouhý"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certifikát je zrušený"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Překročena delká cesty"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Nepodporované osvědčení certifikátu"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certifikát je nedůvěryhodný"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certifikát odmítnut"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Neshoduje se název vydavatele"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Název klíče se neshoduje s Autoritou"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Vydavatelovo sériové číslo se neshoduje s Autoritou"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Použítý klíč neobsahuje podpis certifikátu"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Ověřování aplikace skončilo neúspěchem"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Znovu připojit ručně."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %s odpověděl chybně na požadavek regisrace: %s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytnul rozdílný registrační formulář"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server odpověděl: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Spojení s proxy selhalo"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Selhalo připojení k účti %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Spojení s účtem %s bylo ztraceno. Opět se připojte."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6370,7 +6644,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6379,38 +6653,38 @@ msgstr ""
 "\n"
 "Neznámá SSL chyba: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Odeslán kontakt: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Odeslány kontakty:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
 
@@ -7301,159 +7575,184 @@ msgstr "video vstup"
 msgid "video output"
 msgstr "video výstup"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?transfer status:Pozastaveno"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Pryč"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?contact has status:Neznámý"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "stav"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Žádná"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Příjemce"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Odesílatel"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Oboustranná"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Není"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Žádná"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Účastníci"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Účastník"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "píše zprávu..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7461,22 +7760,22 @@ msgstr[0] "Čeká %d zpráva"
 msgstr[1] "Čekají %d zprávy"
 msgstr[2] "Čeká %d zpráv"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "z místností %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "od uživatele %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7484,75 +7783,75 @@ msgstr[0] "Čeká %d událost"
 msgstr[1] "Čekají %d události"
 msgstr[2] "Čeká %d událostí"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Chtěl(a) bych si Vás přidat do mého Seznamu."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 #, fuzzy
 msgid "Hello, I am $name."
 msgstr "Ahoj, já jsem $name"
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Obrázek je příliš veliký"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL certifikát není správný"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrační informace pro transport %s nedorazily včas"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "zpráva"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
@@ -7588,43 +7887,43 @@ msgstr ""
 "Session bus není k dispozici.\n"
 "Zkuste přečíst http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Zkontrolujte zda je Avahi nebo Bonjour nainstalováno."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Nepodařilo se spustit lokální službu"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemůžu naslouchat na portu %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Zkontrolujte, zda avahi-daemon běží."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nemůžu změnit stav účtu \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Vaše zpráva nemohla být odeslána."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je offline. Vaše zpráva nemohla být odeslána."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Spojení k počítači nebylo navázáno:Vypršel čas při odesílání dat."
@@ -7869,6 +8168,11 @@ msgstr "_Zakázat"
 msgid "_Add to Roster"
 msgstr "Přid_at do Seznamu"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "Spustit _příkaz..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8151,11 +8455,11 @@ msgstr "Komentář"
 msgid "Con_tinue"
 msgstr "_Pokračovat"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Zrušit"
@@ -8164,31 +8468,31 @@ msgstr "_Zrušit"
 msgid "_Open Containing Folder"
 msgstr "_Otevřít obsahující složku"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Přenosy souborů"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "výpis přenosů souborů"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Seznam aktivních, dokončených a zastavených přenosů souborů"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Vymazat"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Odstraní dokončené, zrušené nebo přenosy které selhaly, z výpisu"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Odstranit přenos souboru ze výpisu."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8196,32 +8500,37 @@ msgstr ""
 "Tato akce smaže jeden přenos souboru z výpisu. Pokud je přenos aktivní, bude "
 "nejdříve zastaven a potom smazán"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Zruší vybraný přenos souboru a smaže nedokončený soubor"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Zrušit přenos souboru"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Zruší vybraný přenos souboru"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "Ode_slat a zavřít"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Skryje okno"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozornit mě po dokončení přenosu souboru"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Zobrazí výpis přenosů souborů mezi Vámi a ostatními"
 
@@ -8230,7 +8539,7 @@ msgid "Register to"
 msgstr "Zaregistrovat"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8261,21 +8570,21 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Smazat formátování"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Zobraz seznam smajlíků (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Vyber soubor k odeslání..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Zobraz seznam smajlíků (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Událost"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Událost"
@@ -8338,7 +8647,7 @@ msgstr "<b>Písmo</b>"
 msgid "<b>#</b>"
 msgstr "<b>Písmo</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "č."
 
@@ -9102,10 +9411,6 @@ msgstr "_Otevřít..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor rozšířeného nastavení</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Rozšířené"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Začít _rozhovor"
@@ -9345,7 +9650,7 @@ msgid "_Open Email Composer"
 msgstr "_Otevři Emailový editor"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Začít rozhovor"
 
@@ -9391,6 +9696,10 @@ msgstr "Nastavení"
 msgid "Default:"
 msgstr "Výchozí"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Přidat nový kontakt"
@@ -9416,6 +9725,16 @@ msgstr "_Přezdívka:"
 msgid "_Group:"
 msgstr "_Skupina:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Uživatel:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Přezdívka"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9453,6 +9772,11 @@ msgstr ""
 "Musíš být připojen(á) k trasportu před přidáním\n"
 " kontaktu z tohoto protokolu."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "Z_měnit popis stavu"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Nálada:</b>"
@@ -9678,10 +10002,9 @@ msgstr "Provést příkaz..."
 msgid "_Verify"
 msgstr "_Kontroluj"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Účty"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b> informace)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9708,11 +10031,6 @@ msgstr "Zobrazit pouze _aktivní kontakty"
 msgid "Show Transports"
 msgstr "Zobrazuj trans_porty"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Přenosy souborů"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9786,48 +10104,33 @@ msgstr "Minimalizovat po připojení"
 msgid "Pr_int status:"
 msgstr "Vypiš stav:"
 
-#: gajim/data/gui/exception_dialog.ui:7
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Exception"
-msgstr "Popis"
+msgid ""
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
+msgstr "Pravděpodobně není fatální, ale přesto by měla být ohlášena vývojářům."
 
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:115
 #, fuzzy
 msgid "Report Bug"
 msgstr "_Ohlásit chybu"
 
-#: gajim/data/gui/exception_dialog.ui:89
-#, fuzzy
-msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
-msgstr "Pravděpodobně není fatální, ale přesto by měla být ohlášena vývojářům."
-
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Žádost o autorizaci"
-
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "O_dmítnout"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Odmítne autorizaci od kontaktu, takže nezjistí kdy jste připojen(a)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Akce"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_torizuj"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autorizovat kontakt, aby věděl kdy jsi připojený(á)"
 
@@ -9845,11 +10148,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Stav"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Pozvat přátele !"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9858,15 +10161,20 @@ msgstr ""
 "Začátek Více-uživatelského rozhovoru.\n"
 "Vyberte kontakty, které chcete pozvat"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Prosím, vyberte MUC server."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC server"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Pozvat do"
 
@@ -9985,11 +10293,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Uklízím"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10152,6 +10455,16 @@ msgstr "Zobrazit všechny čekající _události"
 msgid "Mute Sounds"
 msgstr "Vypnout zvuky"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Nastavení"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Konec"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Příjemce:"
@@ -10559,14 +10872,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Nastavení místnosti"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
@@ -10692,6 +10997,32 @@ msgid "Plugin manager"
 msgstr "Registrace selhala"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP účet %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Popis"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>%(jid)s</b> by chtěl(a), aby jste </b>%(action)s</b> některé kontakty "
+#~ "z vašeho rosteru."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Řazený seznam (oddělený mezerami) spojení, která má Gajim zkusit. "
+#~ "Možnosti jsou: tls, ssl nebo plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Akce"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Je potřeba python-dbus."
 
@@ -10891,12 +11222,6 @@ msgstr "Registrace selhala"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Použití: /%s, skryje tlačítka rozhovoru."
 
-#~ msgid "File is empty"
-#~ msgstr "Soubor je prázdný"
-
-#~ msgid "File does not exist"
-#~ msgstr "Soubor neexistuje"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10925,58 +11250,6 @@ msgstr "Registrace selhala"
 #~ msgstr "Je potřeba python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?transfer status:Pozastaveno"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?transfer status:Pozastaveno"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?contact has status:Neznámý"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "stav"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Subscription we already have:Žádná"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Ask (for Subscription):Není"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Group Chat Contact Role:Žádná"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Group Chat Contact Affiliation:Žádná"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Všechny"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Žádný"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Připojen"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "účet"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "stav"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "zpráva"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "priorita"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "místnost"
 
@@ -10988,30 +11261,6 @@ msgstr "Registrace selhala"
 #~ msgid "?CLI:password"
 #~ msgstr "heslo"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Diskuze"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Stáhnout"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Nahrát"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:Pozastaveno"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Client:Neznámý"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Neznámý"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Time:Neznámý"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Používej DBus a Notifikačního démona k zobrazování notifikací"
 
@@ -11221,9 +11470,6 @@ msgstr "Registrace selhala"
 #~ msgid "Choose _Key..."
 #~ msgstr "Vyberte _klíč..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Použít GPG _Agenta"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
@@ -11345,18 +11591,6 @@ msgstr "Registrace selhala"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Vstup XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtr:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Vstup XML</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "Ode_slat"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML Konzole pro %s"
 
@@ -11787,9 +12021,6 @@ msgstr "Registrace selhala"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESession</b> informace)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Jméno kontaktu"
@@ -12892,9 +13123,6 @@ msgstr "Registrace selhala"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
@@ -13043,9 +13271,6 @@ msgstr "Registrace selhala"
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr "Spojení k počítači nebylo navázáno: Neplatná odpověd od serveru"
 
-#~ msgid "Encryption disabled"
-#~ msgstr "E2E Šifrování vypnuto"
-
 #~ msgid "Verify remote identity"
 #~ msgstr "Ověřit identitu"
 
diff --git a/po/da.po b/po/da.po
index e909bc85d..3eed9837c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-11-18 19:33+0100\n"
 "Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
 "Language-Team:  <>\n"
@@ -26,20 +26,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Fejl."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Virkelig send denne fil?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -97,70 +97,70 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Fremgang"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Du"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Afsender: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Modtager: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gemt i: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Filoverførsel er fuldført"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Åbn folderen med filen"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Filoverførsel er afbrudt"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Tilslutning til ligeværdige kan ikke oprettes."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Modtager: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Fejl besked: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Filoverførsel stoppede"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -168,34 +168,34 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Vælg en Fil at Sende..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Send"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim kan ikke tilgå denne fil"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive den eksisterende fil \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -203,93 +203,93 @@ msgstr ""
 "En fil med dette navn eksisterer allerede og du har ikke rettigheder til at "
 "overskrive den."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Denne fil eksisterer allerede"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Hvad vil du gøre?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Kataloget \"%s\" er ikke skrivbart"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheder til at oprette filer i dette katalog."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Gem Fil som..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vil gerne sende dig en fil:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Sender profil..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Filoverførsel Fejl"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Fil: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig at sende tomme filer"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Navn: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Afsender: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pause"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Fortsæt"
 
@@ -448,43 +448,64 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Kræver python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Tilgængelig"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Egenskab"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Fejl ved læsning af fil:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Fejl ved fortolkning af fil:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Udvidelse er ikke understøttet"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Billede kan ikke gemmes i formatet %(type)s. Gem som %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Gem Billede som..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Har"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Client:Ukendt"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Ukendt"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Tid:Ukendt"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilknytning:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -493,7 +514,7 @@ msgstr ""
 "Denne kontakt er interesseret i din tilstedeværelses information, men du er "
 "ikke interesseret i hans/hendes tilstedeværelse"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -502,14 +523,14 @@ msgstr ""
 "Du er interesseret i kontaktens tilstedeværelses information, men han/hun er "
 "ikke interesseret i din"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Du og kontakten er begge interessered i hinandens tilstedeværelses "
 "information"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -518,27 +539,37 @@ msgstr ""
 "Du og kontakten er begge interessered i hinandens tilstedeværelses "
 "information"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar om din abonnements forespørsel"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Alle filer"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Gør Rent"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Håndter Proxy Profiler"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -581,13 +612,13 @@ msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Ikke i Kontaktvinduet"
 
@@ -600,7 +631,7 @@ msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
 msgid "Send Single _Message…"
 msgstr "Send en Enkel _Besked"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Send _Tilpasset Status"
@@ -618,25 +649,25 @@ msgstr "Hå_ndter Transport"
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Omdøb"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Fjern blokering"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Bloker"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "_Fjern"
@@ -650,210 +681,230 @@ msgstr "_Information"
 msgid "Send File..."
 msgstr "Send _Fil..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Inviter _Kontakter"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Tilføj til Kontaktliste"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historie"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Håndter Ru_m"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Ændre _Emne..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Tilpas _Rum..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Slet rum"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Ændre _Kælenavn..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Bogmærk dette rom"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Stemme"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Forvalgte beskeder:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimer ved lukning"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Kør Kommando"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Afbry_d tilslutningen"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Bliv med i en Gruppe Samtale"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Tilføj Kontakt..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "fil"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "Op_dag Tjenester"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Send en Enkel _Besked..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avanceret"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Indstillinger"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synkroniser"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Konsol"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Administrator"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Send Server Besked..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Sæt MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Opdater MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Slet MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Ingen konto tilgængelig"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Konti"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "besked"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Føl_elsesikoner:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finde historik log databasen"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Dato"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Kælenavn"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Besked"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Emne"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Vil du rydde op i databasen? (DETTE ER IKKE ANBEFALET HVIS GAJIM KØRER)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -868,99 +919,99 @@ msgstr ""
 "\n"
 "I tilfælde du trykker JA, venligst vent..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Database Fejl"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Eksporter Historik Log..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s klokken %(time)s sagde: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Vil du virkelig slette den valgte besked?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Vil du virkelig slette loggen for den valgte kontakt?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Tjenesten findes ikke"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Annuller bekræftelse"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vil du virkelig slette den valgte besked?"
 msgstr[1] "Vil du virkelig slette de valgte beskeder?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Dette er en irreversibel handling."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Henter profil..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontakt Information"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Information modtaget"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Uden en tilslutning kan du ikke publicere din kontakt information."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Sender profil..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Information er IKKE publiceret"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard publicering fejlede"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -978,10 +1029,10 @@ msgstr "Kontakt navn: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "General"
@@ -1067,36 +1118,36 @@ msgstr "Fyld ind data for den kontakt som du vil tilføje kontoen med navnet %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyld ind data for den kontakt som du vil tilføje"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruger ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "Bruger ID'en må ikke indeholde en resource."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke tilføje dig selv til kontaktvinduet."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakten er allerede i kontaktvinduet"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Denne kontakt er allered i dit kontaktvindue"
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Bruger ID:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Fejl ved tilføjelse af tjeneste. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1104,59 +1155,59 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "En GTK+ Jabber klient"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ Version:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK Version:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Nuværende Programudviklere:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Tidligere Programudviklerer:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "Sidst men ikke mindst, vil vi gerne takke alle pakke vedligeholdere."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Ordbog for sproget %s er ikke tilgængelig"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1169,12 +1220,12 @@ msgstr ""
 "\n"
 "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Ikke sikker forbindelse"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1186,282 +1237,306 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Ikke spørg mig ige_n"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Ugyldigt kælenavn"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Kælenavnet har ikke tilladte tegn."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Abonnement Forespørgsel"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Forespørgsel på abonnering for konto %(account)s fra %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Forespørgsel om abonnering fra %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Bliv med i en Gruppe Samtale"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Ugyldig rum"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kælenavn"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Opret et nyt tema med dit ønskede navn."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan kun deltage i en gruppe samtale hvis du er tilsluttet."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Forkert uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan kun synkronisere dine kontakter når du er tilsluttet."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Navn"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Denne konto er ikke tilsluttet til serveren"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan kun synkronisere med en konto hvis du er tilsluttet."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Fortsat samtale"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Ny Gruppe Samtale"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Tilføj Ny Kontakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan kun ændre din adgangskode hvis du er tilsluttet."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Ugyldig adgangskode"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Du må indtaste en adgangskode."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Adgangskoderene i de to tekstindtastningsfelter må være identiske."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakt Loggede Ind"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Ny Besked"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Ny Enkel Besked"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Ny Privat Besked"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Filoverførsel Fejl"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Filoverførsel er Fuldført"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale Invitation"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakt Ændrede Status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Besked med konto %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Besked i konto %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Enkel Besked"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Modtaget %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Formular %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vær venligst sikker på at du er tilsluttet med \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Det er ikke mulig at sende en besked til %s, denne JID er ikke gyldig."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Gør Rent"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filter:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML Inddata</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Send"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Trist"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Ændre"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1469,216 +1544,216 @@ msgid ""
 msgstr ""
 "<b>%s</b> vil gerne at du <b>%s</b> nogle kontakter i dit kontaktvindue."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Tilføj"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Ændre"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Slet"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Grupper"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s foreslog mig at tilføje dig til min kontaktliste."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Tilføj Kont_akt"
 msgstr[1] "Tilføj Kont_akt"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Fjerner kontakt fra kontaktvinduet"
 msgstr[1] "Fjerner kontakt fra kontaktvinduet"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Indstillinger"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Tjeneste returnerede en fejl."
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Fejl"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatlivs Liste <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Privatlivs Liste"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rækkefølge: %(order)s, handling: %(action)s, type: %(type)s, værdi: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rækkefølge: %(order)s, handling: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Tilføj en regel</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Ugyldig Listenavn"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må indtaste et navn for at skabe en privatlivs liste."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har inviteret dig til at deltage i en diskussion"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 "$Contact har inviteret dig til at deltage i en gruppe samtale %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Vil du acceptere denne invitation?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Vælg Lyd"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav Lyde"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Vælg Billede"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Billeder"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Vælg Billede"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Alle filer"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s bliver:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Tilføj Speciel Påmindelse for %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "for konto %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1702,69 +1777,97 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL certifikat fejl"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Filoverførsler"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E kryptering ikke aktiveret"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nu kendt som %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nu %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke længere i gruppe samtale \"%(room)s\" eller \"%(nick)s\" har "
 "forladt rummet."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Metakontakt lagring er ikke understøttet af din server"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Ændre emne"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Anfør et nyt emne:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Ændre kælenavn"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Anfør dit nye kælenavn:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Ugyldig gruppe samtale Jabber ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Fjern %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1773,253 +1876,263 @@ msgstr ""
 "Du er ved at definitivt fjerne dette rum.\n"
 "Du kan anføre en grund herunder:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "og godkendt"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "og IKKE godkendt"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale session %(logged)s blive logget."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Fortsat samtale"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s har sat emnet til %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Rum logging er nu aktiveret"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Rum logging er nu deaktiveret"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Rummet er nu ikke-anonymt"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Rummet er nu semi-anonymt"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Rummet er nu helt anonymt"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s .s)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Rum logging er aktiveret"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Et nyt rum er blevet oprettet"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har fastsat eller ændret dit kælenavn for rummet"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s er blevet udvist: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s er blevet udvist af %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blevet uønsket: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s er blevet uønsket af %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "tilknytning ændret"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "computeren slukkes"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s af "
 "%(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s af %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s har forladt samtalen"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på du vil forlade gruppe samtalen \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Hvis du lukker dette vindue vil du blive frakoblet fra denne gruppe samtale."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparker %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Du kan anføre en begrundelse under:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Udeluk %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Filoverførsler"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Filoverførsler"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Hvis en liste over følelsesikoner"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Denne kontakt understøtter ikke fil overførsler."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Session forhandling annulleret"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Session VIL IKKE blive logget"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Denne session er krypteret"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " og VIL blive logget"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " og VIL IKKE blive logget"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2027,16 +2140,16 @@ msgstr ""
 "Kontaktens identitet er ikke verificeret Tryk på skjold knappen for flere "
 "detaljer."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering ikke aktiveret"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2044,7 +2157,7 @@ msgstr ""
 "Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
 "miste denne besked."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2053,7 +2166,7 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2062,98 +2175,98 @@ msgstr ""
 "Ikke i stand til at dekryptere beskeden fra %s\n"
 "Det er mulig den er blevet forfalsket."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nu %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Filoverførsler"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Størrelse: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "K_ontoer"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Bliv med:"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Den fjerne kontakt stoppede filoverførslen"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Fejl ved åbning af fil"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Flettede konti"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transporter"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nu vil %s vide din status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Hvis %s accepterer denne forespørsel vil du kunne se hans eller hendes "
 "status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG er ikke brugbar"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2161,11 +2274,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Du deltager i en eller flere gruppesamtaler"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2173,38 +2286,38 @@ msgstr ""
 "Hvis du ændrer din status til usynlig vil det resultere i at du bliver "
 "frakoblet fra disse gruppesamtaler. Er du sikker på du vil gøre dig usynlig?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "ikke synkroniseret"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Skal Gajim afsluttes?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på du vil afslutte Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Altid afslut Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Annuller filoverførsel"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Du har ulæste beskeder"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2212,16 +2325,16 @@ msgstr ""
 "Beskeder vil kun være tilgængelige for læsning senere hvis du har historik "
 "aktiveret og kontakten er i dit kontaktvindue."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Du må læse dem før du fjerner denne transport."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil blive fjernet"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2229,11 +2342,11 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger denne transport."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transporter vil blive fjernet"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2242,11 +2355,11 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger disse transporter: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Du er ved at blokere en kontakt. Er du sikker på du vil fortsætte?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2255,56 +2368,56 @@ msgstr ""
 "Denne kontakt vil se dig offline og du vil ikke modtage beskeder han sender "
 "dig."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Omdøb Kontakt"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Omdøb Gruppe"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Fjern Gruppen"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vil du fjerne gruppen %s fra kontaktvinduet?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Fjern også alle kontakter i denne gruppe fra kontaktvinduet"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Tildel OpenPGP Nøgle"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Vælg den nøgle du vil anvende til kontakten"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt %s vil blive fjernet fra dit kontaktvindue"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Du er ved at fjerne \"%(name)s\" (%(jid)s) fra dit kontaktvindue.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2314,11 +2427,11 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2327,15 +2440,15 @@ msgstr ""
 "Ved at fjerne denne kontakt fjerner du også samtidig godkendelsen, så han "
 "eller hun altid vil se dig som offline."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Jeg vil at denne kontakt kan se min status efter den er blevet fjernet"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter vil blive fjernet fra dit kontaktvindue"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2345,14 +2458,14 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Du er ved at sende en personlig status. Er du sikker på du vil fortsætte?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2361,25 +2474,25 @@ msgstr ""
 "Denne kontakt vil midlertidig se dig som %(status)s, men kun indtil du "
 "ændrer din status. Da vil han se din globale status."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Du må oprette en konto før du kan begynde en samtale med andre kontakter."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke deltage i en gruppe samtale mens du er usynlig"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2389,12 +2502,12 @@ msgstr ""
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
@@ -2402,194 +2515,194 @@ msgstr ""
 "Metakontakter er en måde at gruppere flere kontakter på en linie. Oftest "
 "bruges det når den samme person har flere Jabber eller transport konti."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vil du sende denne fil til %s:"
 msgstr[1] "Vil du sende disse filer til %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s til %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Lav %s og %s til metakontakter"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Lav %s og %s til metakontakter"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicer Melodi"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Tilpas Tjenester..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Håndter Kontakter"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Ændre _Grupper"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Kan fjernes"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Tilslut igen"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "Afbry_d tilslutningen"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historie"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Historik Håndterer"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Deltag i Ny Gruppe Samtale"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Ændre Status Besked"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Vis hændelse i kontaktvindue"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Avanceret Konfigurations Behandler"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Rum Konfigurering"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Vis Alle Ventende Hænd_elser"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Database Fejl"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Hvad vil du gøre?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Tilslutter"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Videresend ulæste beskeder"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2598,7 +2711,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2606,7 +2719,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2752,16 +2865,16 @@ msgstr "Følelsesikoner er ikke aktiveret"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Gem adgangskode"
 
@@ -2793,10 +2906,18 @@ msgstr "Fjern kun k_ontoen fra Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Alle"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Gå kun ind og ud"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Ingen"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Ny Gruppe Samtale"
@@ -2862,11 +2983,11 @@ msgstr "Ugyldig indgang"
 msgid "Custom port must be a port number."
 msgstr "Personlig port må være et port nummer."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certifikatet er allerede i filen"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2971,90 +3092,113 @@ msgstr "Gruppe Samtale Besked Fremhævning"
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Besked Modtaget"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s af denne gruppe samtale"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Ingen"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Medlem"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Ejer"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [blokeret]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [minimeret]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Tilslutning afbrudt"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Hent"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Send"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Type: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Fuldført"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:Midlertidig stoppet"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Hænger"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Overfører"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?transfer status:Midlertidig stoppet"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Tilgængelig for samtale"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Borte"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Travlt"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Ikke Tilgængelig"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Afkoblet"
 
@@ -3103,124 +3247,128 @@ msgstr "(Ingen)"
 msgid "Hidden"
 msgstr "Skjult"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversations Historik med %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Samtale Historie"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Disk Skrivefejl"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nu %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Fejl: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Fejl"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nu: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nu: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Ændre Status Besked"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "med konto %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Håndter Bogmærker"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktvinduet"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Vis _Kontaktvindue"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Usynlighed er ikke understøttet"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Værtsnavn:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Server svarede: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3379,7 +3527,7 @@ msgstr "_Abonner"
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3387,51 +3535,57 @@ msgstr ""
 "Teksten under denne linje er hvad der er blevet sagt siden\n"
 "sidste gang du var opmærksom på denne gruppe samtale"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Citat"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Læs _Wikipedia Artikel"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Slå dette op i Or_dbogen"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbogens URL mangler en \"%s\" og det må ikke være WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web søge URL'en mangler en \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Søg på nettet efter det"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Åbn som et _Link"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Ugyldig JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3443,30 +3597,35 @@ msgstr[1] "I går"
 msgid "Write a message.."
 msgstr "Ny Privat Besked"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Du er ved at lukke flere faneblade"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Vil du virkelig lukke dem alle?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Gruppe Samtaler"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Beskeder"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3478,109 +3637,109 @@ msgstr ""
 "anden indehaver.\n"
 "Specificer venligst et andet kælenavn under:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Altid brug dette kælenavn når der er en konflikt"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Accepterer du denne forespørsel?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterer du denne forespørgsel for konto %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisering for %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Tilslutning Fejlede"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "En adgangskode er påkrævet for at deltage i rummet %s. Venligst skriv den."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Skrifttype</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Du er bandlyst fra gruppesamtalen %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Gruppesamtalen %s eksisterer ikke."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Gruppesamtalen %s eksisterer ikke."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Gruppesamtale oprettelse er begrænset."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fejl %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fejl opstod under sending %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Abonnement forespørgsel"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Iagttagere"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorisering accepteret"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkendt dig til at se hans eller hendes status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3589,31 +3748,31 @@ msgstr ""
 "Du vil altid se ham eller hende som offline.\n"
 "Vil du fjerne ham eller hende fra din kontakt liste?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Frameldt abonnement"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke blive etableret"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Kontroller din tilslutning eller forsøg igen senere."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3622,36 +3781,36 @@ msgstr ""
 "Du har konfigureret Gajim til at bruge GPG agenten, men der er ingen GPG "
 "agent som kører eller den returnerede en forkert gpg-løsen.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Forkert Adgangskode"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Forkert Adgangskode"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikatet er udløbet"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Indtast adgangskoden til GPG nøglen %(keyid)s (Konto %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Vælg din OpenPGP Nøgle"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3660,77 +3819,82 @@ msgstr ""
 "GPG nøglen brugt til at kryptere den samtale er ikke til at stole på. Vil du "
 "virkelig kryptere den besked?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL certifikat fejl"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Filoverførsler"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har succesfuldt sendt %(filename)s til %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Vælg en Fil at Sende..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Ikke i stand til at dekryptere beskeden"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Brugernavns Konflikt"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Ressource Konflikt"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3738,21 +3902,21 @@ msgstr ""
 "Du er allerede tilsluttet til denne konto med den samme ressource. Skriv "
 "venligst en ny"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Fejl under verificering af SSL certifikat"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3763,7 +3927,7 @@ msgstr ""
 "server: %(error)s\n"
 "Vil du stadig prøve på at forbinde til denne server?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3776,15 +3940,15 @@ msgstr ""
 "Certifikatets SHA1 fingeraftryk:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne fejl for dette certifikat."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3805,7 +3969,7 @@ msgstr ""
 "\n"
 "Vil du stadig forbinde og opdatere fingeraftrykket for certifikatet?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3814,7 +3978,7 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3823,16 +3987,16 @@ msgstr ""
 "Du er ved at sende din adgangskode over en ikke krypteret forbindelse. Er du "
 "sikker på du vil gøre dette?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3840,7 +4004,7 @@ msgstr ""
 "Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
 "blevet deaktiveret."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3849,11 +4013,11 @@ msgstr ""
 "Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
 "blevet deaktiveret."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3861,41 +4025,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "standard"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Adgangskode Påkrævet"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Indtast adgangskoden til GPG nøglen %(keyid)s (Konto %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG nøgle er udløbet"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG nøgle er udløbet, du vil blive tilsuttet til %s uden OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Forkert Adgangskode"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Indtast din GPG adgangskode igen eller annuller."
@@ -3967,6 +4131,11 @@ msgstr "- beskeder vil blive logget"
 msgid "- messages will not be logged"
 msgstr "- beskeder vil ikke blive logget"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3998,7 +4167,7 @@ msgstr "Ugyldig rum"
 msgid "The form is not filled correctly."
 msgstr "Kælenavnet har ikke tilladte tegn."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -4129,6 +4298,56 @@ msgstr ""
 "%s\n"
 "Link-local beskeder vil sandsynligvis ikke virke ordentligt."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Kunne ikke starte lokal tjeneste"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Kunne ikke laste billede"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Tjeneste returnerede en fejl."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Kunne ikke laste billede"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "En tilslutning er ikke tilgængelig"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4154,7 +4373,17 @@ msgstr "Du kan ikke slette det nuværende tema"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Flettede konti"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Brug G_PG Agenten"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
@@ -4177,6 +4406,11 @@ msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Alle samtale og gruppesamtale vinduer vil blive lukket. Vil du fortsætte?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Kan fjernes"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4370,62 +4604,82 @@ msgstr "Ændre Adgangskode"
 msgid "Login Options"
 msgstr "Føl_elsesikoner:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "D-Bus er ikke tilgængelig på denne maskine eller et python modul mangler"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Viser hjælp for en specifik kommando"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "Kommando"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "Vis hjælp for kommando"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Viser eller gemmer kontaktvinduet"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Popper op et vindue ved næste hændelse"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Udskriver en liste af alle kontakter i kontaktvinduet. Hver kontakt placeres "
 "på en separat linie"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "Konto"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "viser kun kontakter for den givne konto"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Udskriver en liste af registrerede konti"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 msgid "Changes the status of account(s)"
 msgstr "Ændrer status for kontoen eller konti"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "besked"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "status besked"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4434,15 +4688,20 @@ msgstr ""
 "status for alle konti der har sat \"synkroniser med generel status\" "
 "indstillingen"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 msgid "Changes the priority of account(s)"
 msgstr "Ændrer prioriteringen for kontoen eller konti"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritet"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "prioriteten du vil give til kontoen"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4450,7 +4709,7 @@ msgstr ""
 "ændre prioritet for en given konto. Hvis ikke specificeret, ændrer status "
 "for alle konti der har sat \"synkroniser med generel status\" indstillingen"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4460,29 +4719,29 @@ msgstr ""
 "konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP nøgle', "
 "bare set 'OpenPGP nøgle' til ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID på den kontakt som skal modtage beskeden"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "besked indhold"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hvis specificeret vil beskeden blive krypteret med denne nøgle"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "hvis specificeret vil beskeden blive sendt med denne konto"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4492,125 +4751,125 @@ msgstr ""
 "konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP nøgle', "
 "bare set 'OpenPGP nøgle' til ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "emne"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "emne på besked"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Send en ny besked til en gruppesamtale du deltager i."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID på den rum som skal modtage beskeden"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Få detaljeret information om kontakten"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "Kontaktens JID"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Få detaljeret information om kontoen"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Send en fil til en kontakt"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "fil"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Filsti"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "hvis specificeret vil filen blive sendt med denne konto"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Hvis alle indstillinger og deres værdier"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sætter værdien for 'nøglen' til 'værdi'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "nøgle=værdi"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'nøgle' er navnet for indstillingen, 'værdi' er den værdi den er sat til"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Sletter et indstillingspunkt"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "nøgle"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "navn på den indstilling som skal slettes"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Skriver den nuværende tilstand af Gajims indstillinger til .config filen"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "hvis specificeret vil kontakten tages fra kontaktlisten fra denne konto"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende status (den globale status hvis ikke en konto er "
 "valgt)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende statusbesked (den globale status besked hvis ikke en "
 "konto er valgt)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Returnerer antal ikke læste beskeder"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Sender tilpasset XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML som skal sendes"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4618,17 +4877,17 @@ msgstr ""
 "Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
 "blive sendt til alle konti"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Ændre status"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Kælenavn som skal bruges"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4636,19 +4895,19 @@ msgstr ""
 "Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
 "blive sendt til alle konti"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Kontroller om Gajim kører"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Viser eller gemmer ipython vinduet"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4657,15 +4916,15 @@ msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
 "Specificer venligst en konto for at sende beskeden."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ud til at Gajim ikke kører. Så du kan ikke bruge gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4674,16 +4933,16 @@ msgstr ""
 "Brug: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke fundet"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4694,7 +4953,7 @@ msgstr ""
 "Brug: %s kommando [argumenter]\n"
 "Kommando er en af:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4703,7 +4962,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4877,11 +5136,6 @@ msgstr "Slutten af ugen"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP konto %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4906,52 +5160,52 @@ msgstr "Rummet er blevet ødelagt"
 msgid "You can join this room instead: %s"
 msgstr "Du kan deltage i dette rum i stedet: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukendt SSL fejl: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Besked fra gruppe samtale %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Besked fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Ændrede Status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Loggede Ind"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Loggede Ud"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Ikke i kontaktvindue"
 
@@ -5794,22 +6048,18 @@ msgstr "Aktiver ESessions kryptering for denne konto."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en krypteret session når det er muligt?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"En ordnet liste (adskilt af mellemrum) af forbindelses typer som skal "
-"prøves. Kan indeholde tls, ssl eller plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5818,11 +6068,11 @@ msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Hvis en advarsels dialog før brugen af standard SSL biblioteket."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -5830,37 +6080,37 @@ msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellemrums adskilt liste af ssl fejl som skal ignoreres."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Mellemrum sendt efter inaktivitet"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sendt efter inaktivitet"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5869,11 +6119,11 @@ msgstr ""
 "Hvor mange sekunder skal der ventes på svaret af en holdilive pakke, før vi "
 "prøver at forbinde igen."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 tilpasning"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5881,33 +6131,33 @@ msgstr ""
 "Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
 "indstillingen for filoverførsler."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Svar til modtagelses forespørgsel"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Sendte modtagelses forespørgsler"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vil gerne sende dig en fil."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5915,53 +6165,63 @@ msgstr ""
 "Ved forhandling af en krypteret session, skal Gajim da antage at du vil have "
 "dine beskeder logget?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Fyld ind data for den kontakt som du vil tilføje"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anonym godkendelse"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anonym godkendelse"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anonym godkendelse"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprog som vi vil bruge til at kontrollere for stavefejl"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
@@ -5970,7 +6230,7 @@ msgstr ""
 "Hvor mange linjer skal hentes fra serveren når man deltager i en "
 "gruppesamtale."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
@@ -5979,90 +6239,90 @@ msgstr ""
 "Hvor mange minutter tilbage skal der hentes log fra når man deltager i en "
 "gruppesamtale."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Snart tilbage"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så læg en besked."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Arbejder"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Jeg arbejder."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Jeg snakker i telefon."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Ude"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Jeg er ude og nyder livet."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Jeg er tilgængelig."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgængelig."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Ikke forstyr."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Farvel!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6071,27 +6331,27 @@ msgstr ""
 "muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
 "kælenavn."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en hvilken som helst MUC besked ankommer."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "grøn"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "købmandsvarer"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "menneske"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marint"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Til"
@@ -6170,37 +6430,50 @@ msgstr "Alle ulæste beskeder er blevet videresendt."
 msgid "Forward unread message then disconnect"
 msgstr "Videresend ulæste beskeder"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Filen er tom"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Filen eksisterer ikke"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "opretter log database"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "opretter log database"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Send %s til %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er en fil, men burde være et katalog"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim vil nu slutte"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er et katalog men burde være en fil"
@@ -6210,11 +6483,11 @@ msgstr "%s er et katalog men burde være en fil"
 msgid "Error: cannot open %s for reading"
 msgstr "Fejl: kan ikke åbne %s for læsning"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "flytter log databasen til flere indeks"
 
@@ -6223,190 +6496,190 @@ msgstr "flytter log databasen til flere indeks"
 msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldigt logniveau"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til at skaffer udstedelses certifikat"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til at skaffe certifikat CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til at dekryptere certifikatets signatur"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til at dekryptere CRL's signatur"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Ikke i stand til at dekode udstederens offentlige nøgle"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Certifikat signaturen fejlede"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "CRL signatur fejl"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfejl i certifikatets notBefore felt"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfejl i certifikatets notAfter felt"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfejl i CRL's lastUpdate felt"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfejl i CRL's nextUpdate felt"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Selvsigneret certifikat"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsigneret certifikat i certifikats kæden"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Ikke i stand til at skaffe lokalt udstedelses certifikat"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Ikke i stand til at verificere det første certifikat"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Certifikat kæde er for lang"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA certifikat"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Sti længde begrænsning overskredet"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Ikke understøttet formål for certifikatet"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certifikatet er ikke til at stole på"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certifikatet afvist"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Emne udsteder uoverensstemmelse"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og emne nøgle identifikations uoverensstemmelse"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og udstedelses serie nummer uoverensstemmelse"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Nøglebrug indeholder ikke certifikat signering"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Tilslut manuelt."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Server %(name)s svarede forkert på indskrivnings forespørgslen: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serveren %s gav en anderledes registreringsform"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Kunne ikke tilslutte til \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Kunne ikke tilslutte til \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server svarede: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke tilslutte til kontoen %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "Tilslutning til kontoen \"%s\" er blevet afbrudt. Prøv at tilslutte igen."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Ægtheden af %s certifikatet kan være ugyldig."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6415,7 +6688,7 @@ msgstr ""
 "\n"
 "SSL Fejl: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6424,38 +6697,38 @@ msgstr ""
 "\n"
 "Ukendt SSL fejl: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Ægtheden af %s certifikatet kan være ugyldig."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke tilslutte til \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Godkendelse fejlede med \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Venligst kontroller om dit logind og adgangskode er korrekt."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Sendte kontakter:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grund af usynlig status"
 
@@ -7326,255 +7599,280 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i værtsnavn."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Server adresse påkrævet."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brugernavn."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressource."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Travlt"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Ikke tilgængelig"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Tilgængelig for samtale"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?transfer status:Midlertidig stoppet"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Væk"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Afkoblet"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?contact has status:Ukendt"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?contact has status:Har fejl"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Intet"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Til"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Fra"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Begge"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Intet"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Deltagere"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Deltager"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Besøgende"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Besøgende"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "er opmærksom på samtalen"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "gør noget andet"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "komponerer en besked..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "holder pause med at komponere en besked"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d besked venter"
 msgstr[1] "%d beskeder venter"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "fra rum %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "fra bruger %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " fra %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hændelse venter"
 msgstr[1] "%d hændelser venter"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Jeg vil gerne tilføje dig til min kontakt liste."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Tidsudløb nået for at laste billede"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Billede er for stort"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Tidsudløb nået for at laste billede"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings information for transporten %s har ikke ankommet i tide"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "besked"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
 
@@ -7611,43 +7909,43 @@ msgstr ""
 "Sessions bussen er ikke tilgængelig.\n"
 "Prøv at læse http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ikke i stand til at tildele port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontroller venligst om avahi-dæmonen kører."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke ændre status på kontoen \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Din besked kunne ikke sendes."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt er afkoblet. Din besked kunne ikke sendes."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7894,6 +8192,11 @@ msgstr "_Udvis"
 msgid "_Add to Roster"
 msgstr "_Tilføj til Kontaktliste"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Kør Kommando"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8177,11 +8480,11 @@ msgstr "Om"
 msgid "Con_tinue"
 msgstr "_Fortsæt"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pause"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Afbryd"
@@ -8190,31 +8493,31 @@ msgstr "_Afbryd"
 msgid "_Open Containing Folder"
 msgstr "_Åbn folderen med filen"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Filoverførsler"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "filoverførsel liste"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "En liste over aktive, færdige og stoppede filoverførsler"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Ryd _op"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Fjerner færdige, annullerede og mislykkede filoverførsler fra listen"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverførsler fra listen."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8222,32 +8525,37 @@ msgstr ""
 "Denne handling fjerner en enkelt filoverførsel fra listen. Hvis overførslen "
 "er i gang, bliver den først stoppet og derefter fjernet"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Annullerer den valgte filoverførsel og fjerner den ikke fuldførte fil"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Annuller filoverførsel"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Annullerer den valgte filoverførsel"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Send & Luk"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Skjuler vinduet"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Påmind mig når en filoverførsel er færdig"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Viser en liste over filoverførsler mellem dig og andre"
 
@@ -8256,7 +8564,7 @@ msgid "Register to"
 msgstr "Registrer til"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8287,21 +8595,21 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Fjern formatering"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Hvis en liste over følelsesikoner (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Vælg en Fil at Sende..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Hvis en liste over følelsesikoner (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Hændelse"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Hændelse"
@@ -8364,7 +8672,7 @@ msgstr "<b>Skrifttype</b>"
 msgid "<b>#</b>"
 msgstr "<b>Skrifttype</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9121,10 +9429,6 @@ msgstr "_Åbn..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Avanceret Konfigurations Behandler</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avanceret"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Start _samtale"
@@ -9366,7 +9670,7 @@ msgid "_Open Email Composer"
 msgstr "_Åbn E-post Program"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
@@ -9411,6 +9715,10 @@ msgstr "Indstillinger"
 msgid "Default:"
 msgstr "Standard"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Tilføj Ny Kontakt"
@@ -9436,6 +9744,16 @@ msgstr "_Kælenavn:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Bruger ID:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Kælenavn"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9474,6 +9792,11 @@ msgstr ""
 "Du må være tilsluttet til transporten for at kunne\n"
 "tilføje en kontakt for denne protokol."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Ændre Status Besked"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Humør:</b>"
@@ -9698,10 +10021,9 @@ msgstr "_Udfør Kommando..."
 msgid "_Verify"
 msgstr "Efterprø_v"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Konti"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "<b>(ESession</b> info)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9728,11 +10050,6 @@ msgstr "Vis Kun _Aktive Kontakter"
 msgid "Show Transports"
 msgstr "Vis Trans_porter"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Filoverførsler"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9806,34 +10123,24 @@ msgstr "Minimer ved Automatisk Deltagelse"
 msgid "Pr_int status:"
 msgstr "Skriv status:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Beskrivelse"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Rapporter Fejl"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Den er sikkert ikke kritisk, men bør alligevel rapporteres til udviklerne."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Abonnement Forespørgsel"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Rapporter Fejl"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Nægt"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9841,16 +10148,11 @@ msgstr ""
 "Nægt autorisation fra kontakter så han eller hun ikke kan opnå information "
 "om at du er tilsluttet"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Handlinger"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_torisere"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
 "Autoriser kontakt så han eller hun kan opnå information om at du er "
@@ -9870,11 +10172,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Tilstedeværelse"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Inviter Venner!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9883,15 +10185,20 @@ msgstr ""
 "Du er ved at begynde en Multibruger samtale.\n"
 "Vælg de kontakter du vil invitere"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Vælg en MUC server."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC server"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_viter"
 
@@ -10011,11 +10318,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Gør Rent"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10177,6 +10479,16 @@ msgstr "Vis Alle Ventende Hænd_elser"
 msgid "Mute Sounds"
 msgstr "Slå lyden af"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Indstillinger"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Afslut"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Til:"
@@ -10577,14 +10889,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Rum Konfigurering"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klient"
@@ -10709,6 +11013,31 @@ msgid "Plugin manager"
 msgstr "Tilslutning fejlede"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP konto %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Beskrivelse"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>nogen@etsted.com</b> vil gerne at du <b>tilføjer</b> nogen kontakter i "
+#~ "dit kontaktvindue."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "En ordnet liste (adskilt af mellemrum) af forbindelses typer som skal "
+#~ "prøves. Kan indeholde tls, ssl eller plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Handlinger"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Kræver python-dbus."
 
@@ -10907,12 +11236,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Hide all buttons in chat windows"
 #~ msgstr "Skjul alle knapperne i samtale vinduer."
 
-#~ msgid "File is empty"
-#~ msgstr "Filen er tom"
-
-#~ msgid "File does not exist"
-#~ msgstr "Filen eksisterer ikke"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10942,58 +11265,6 @@ msgstr "Tilslutning fejlede"
 #~ msgstr "Kræver python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?transfer status:Midlertidig stoppet"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?transfer status:Midlertidig stoppet"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?contact has status:Ukendt"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?contact has status:Har fejl"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Subscription we already have:Intet"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Ask (for Subscription):Intet"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Group Chat Contact Role:Ingen"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Group Chat Contact Affiliation:Ingen"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Alle"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Ingen"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Tilgængelig"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "Konto"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "besked"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "prioritet"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "rum"
 
@@ -11005,30 +11276,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "?CLI:password"
 #~ msgstr "adgangskode"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Gruppe Samtaler"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Hent"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Send"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:Midlertidig stoppet"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Client:Ukendt"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Ukendt"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Tid:Ukendt"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr ""
 #~ "Brug D-Bus og Påmindelses-dæmonen (Notification-Daemon) til at vise "
@@ -11235,9 +11482,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "Choose _Key..."
 #~ msgstr "Vælg _Nøgle..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Brug G_PG Agenten"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11367,18 +11611,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML Inddata</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filter:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML Inddata</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Send"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML Konsol for %s"
 
@@ -11785,9 +12017,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>(ESession</b> info)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Kontakt navn"
@@ -11800,13 +12029,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "All Chat Histories"
 #~ msgstr "Status For Alle"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>nogen@etsted.com</b> vil gerne at du <b>tilføjer</b> nogen kontakter i "
-#~ "dit kontaktvindue."
-
 #~ msgid "More"
 #~ msgstr "Mere"
 
diff --git a/po/de.po b/po/de.po
index 70f748256..830cf573b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2016-11-27 12:58+0100\n"
 "Last-Translator: Dominik George <nik@naturalnet.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -29,22 +29,22 @@ msgstr "Ping?"
 
 #: gajim/chat_control_base.py:204
 msgid "Error."
-msgstr "Fehler:"
+msgstr "Fehler."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr "R_ueckgängig"
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
-msgstr "_Löschen"
+msgstr "_Leeren"
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Datei wirklich senden?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -101,69 +101,69 @@ msgstr "Zeit"
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Sie"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Absender: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 msgid "Open _Containing Folder"
-msgstr "Öffne _Ordner"
+msgstr "In Dateiverwaltung _anzeigen"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung abgebrochen"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
-msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
+msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Empfänger: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Fehlermeldung: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -172,34 +172,34 @@ msgid ""
 msgstr ""
 "Die Datei %(file)s wurde empfangen, scheinbar wurde sie jedoch bei der "
 "Übertragung beschädigt.\n"
-"Wollen Sie sie erneut übertragen?"
+"Wollen Sie die Datei erneut übertragen?"
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 msgid "Choose File to Send…"
 msgstr "Datei auswählen…"
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Senden"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 msgid "Gajim can not read this file"
-msgstr "Gajim kann auf diese Datei kann nicht zugreifen"
+msgstr "Gajim kann nicht auf diese Datei zugreifen"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr "Die Datei wird bereits von einem anderen Programm verwendet."
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -207,92 +207,92 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die "
 "erforderlichen Rechte, um sie zu überschreiben."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Was möchten Sie tun?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
 "anzulegen."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 msgid "Save File as…"
 msgstr "Datei speichern unter…"
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s möchte Ihnen eine Datei senden:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 msgid "Checking file…"
-msgstr "Überprüfe Datei..."
+msgstr "Überprüfe Datei…"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 msgid "File error"
 msgstr "Dateifehler"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Datei: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Name: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Absender: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pause"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -341,9 +341,8 @@ msgstr "OpenPGP-Verschlüsselung"
 
 # TODO: GPG/PGP unification in original strings needed
 #: gajim/features_window.py:57
-#, fuzzy
 msgid "Ability to encrypting chat messages with OpenPGP."
-msgstr "Ermöglicht die Verschlüsselung von Nachrichten per GPG."
+msgstr "Ermöglicht die Verschlüsselung von Nachrichten per OpenPGP."
 
 #: gajim/features_window.py:58
 msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
@@ -352,7 +351,7 @@ msgstr ""
 
 #: gajim/features_window.py:59
 msgid "Requires gpg.exe in PATH."
-msgstr "Benötigt gpg.exe im PATH"
+msgstr "Benötigt gpg.exe in PATH."
 
 #: gajim/features_window.py:60
 msgid "Password encryption"
@@ -366,7 +365,7 @@ msgstr "Passwörter können sicher anstatt nur im Klartext gespeichert werden."
 msgid ""
 "Requires libsecret and a provider (such as GNOME Keyring and KSecretService)."
 msgstr ""
-"Benötigt libsecret und einen Anbieter (z.B.GNOME Keyring oder "
+"Benötigt libsecret und einen Anbieter (z.B. GNOME Keyring oder "
 "KSecretService)."
 
 #: gajim/features_window.py:63
@@ -380,11 +379,12 @@ msgstr "Rechtschreibprüfung"
 #: gajim/features_window.py:65
 msgid "Spellchecking of composed messages."
 msgstr ""
-"Ermöglicht das Überprüfen verfasster Nachrichten auf Rechtschreibfehler."
+"Ermöglicht das Überprüfen auf Rechtschreibfehler beim Verfassen von "
+"Nachrichten ."
 
 #: gajim/features_window.py:66 gajim/features_window.py:67
 msgid "Requires Gspell"
-msgstr "Erfordert die libgtkspell-Bibliothek"
+msgstr "Benötigt Gspell."
 
 #: gajim/features_window.py:68
 msgid "Automatic status"
@@ -414,7 +414,7 @@ msgstr "Nachrichten können per ESession verschlüsselt werden."
 
 #: gajim/features_window.py:74 gajim/features_window.py:75
 msgid "Requires python-crypto."
-msgstr "Erfordert python-crypto"
+msgstr "Erfordert python-crypto."
 
 #: gajim/features_window.py:76
 msgid "RST Generator"
@@ -425,8 +425,8 @@ msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
-"Kann aus RST-Code XHTML-Ausgaben erzeugen (siehe http://docutils.sourceforge."
-"net/docs/ref/rst/restructuredtext.html (Englisch))."
+"Kann aus RST-Code XHTML-Ausgaben erzeugen (siehe englische Dokumentation "
+"http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
 #: gajim/features_window.py:78 gajim/features_window.py:79
 msgid "Requires python-docutils."
@@ -454,51 +454,71 @@ msgstr "UPnP-IGD"
 
 #: gajim/features_window.py:85
 msgid "Ability to request your router to forward port for file transfer."
-msgstr "Ermöglicht das Weiterleiten von Ports vom Router für Dateiübertragung."
+msgstr ""
+"Ermöglicht es, bei Ihrem Router die Weiterleitung von Ports für "
+"Dateiübertragungen anzufragen."
 
 #: gajim/features_window.py:86
-#, fuzzy
 msgid "Requires gir1.2-gupnpigd-1.0."
-msgstr "Benötigt python-gupnp-igd."
+msgstr "Benötigt gir1.2-gupnpigd-1.0."
+
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "Vorhanden"
 
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Feature"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Fehler bei der Dateianalyse:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
-msgstr "Erweiterung wird nicht unterstützt."
+msgstr "Erweiterung wird nicht unterstützt"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s "
 "speichern?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 msgid "Save Image as…"
 msgstr "Bild speichern unter…"
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "Speichern _unter"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Unbekannt"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Unbekannt"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "Unbekannt"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "<b>Rolle:</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
-msgstr "<b>Mitgliedschaft:</b>"
+msgstr "<b>Gruppenzugehörigkeit:</b>"
 
-#: gajim/vcard.py:392
-#, fuzzy
+#: gajim/vcard.py:389
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
@@ -506,8 +526,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihrem Status interessiert, aber Sie sind nicht an "
 "seinem interessiert"
 
-#: gajim/vcard.py:394
-#, fuzzy
+#: gajim/vcard.py:391
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
@@ -515,58 +534,62 @@ msgstr ""
 "Sie sind am Status des Kontakts interessiert, aber er ist nicht an Ihrem "
 "interessiert"
 
-#: gajim/vcard.py:396
-#, fuzzy
+#: gajim/vcard.py:393
 msgid "The contact and you want to exchange presence information"
-msgstr "Sie und der Kontakt sind am Status des Anderen interessiert"
+msgstr "Sie und der Kontakt sind beide am Status des Anderen interessiert"
 
-#: gajim/vcard.py:398
-#, fuzzy
+#: gajim/vcard.py:395
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
-msgstr "Sie und der Kontakt sind am Status des Anderen interessiert"
+msgstr "Sie und der Kontakt sind beide am Status des Anderen interessiert"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Sie warten auf die Antwort des Kontaktes bezüglich Ihrer Abonnement-Anfrage"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Es gibt keine offenen Abonnementanfragen."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Alle Dateien"
 
+#: gajim/options_dialog.py:392
+msgid "Clear File"
+msgstr "Auswahl löschen"
+
+#: gajim/options_dialog.py:474
+msgid "Manage Proxies"
+msgstr "Proxies verwalten"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
-msgstr "Kein Proxy"
+msgstr "Keine"
 
 #: gajim/options_dialog.py:506
-#, fuzzy
 msgid "Adjust to Status"
-msgstr "Mit Status _abgleichen"
+msgstr "Mit Status abgleichen"
 
 #: gajim/options_dialog.py:518
 msgid "On"
-msgstr ""
+msgstr "Online"
 
 #: gajim/options_dialog.py:518
-#, fuzzy
 msgid "Off"
 msgstr "Abgemeldet"
 
@@ -594,13 +617,13 @@ msgid "_New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Nicht in der Kontaktliste"
 
@@ -609,19 +632,17 @@ msgid "I would like to add you to my roster"
 msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen"
 
 #: gajim/gui_menu_builder.py:508
-#, fuzzy
 msgid "Send Single _Message…"
-msgstr "Einzelne Nachricht _senden"
+msgstr "Einzelne Nachricht _senden…"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Benu_tzerdefinierten Status senden"
 
 #: gajim/gui_menu_builder.py:541
-#, fuzzy
 msgid "E_xecute Command…"
-msgstr "Befehl ausführen"
+msgstr "Befehl ausführen…"
 
 #: gajim/gui_menu_builder.py:549
 msgid "_Manage Transport"
@@ -629,27 +650,27 @@ msgstr "_Transport verwalten"
 
 #: gajim/gui_menu_builder.py:555
 msgid "_Modify Transport"
-msgstr "_Ändern"
+msgstr "_Transport ändern"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 msgid "_Rename…"
 msgstr "_Umbenennen…"
 
 # TODO: Review by german translators
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Entblocken"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Blockieren"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Ent_fernen"
@@ -660,206 +681,197 @@ msgstr "_Informationen"
 
 #: gajim/gui_menu_builder.py:611
 msgid "Send File..."
-msgstr "_Datei senden…"
+msgstr "Datei senden..."
 
-#: gajim/gui_menu_builder.py:612
-#, fuzzy
+#: gajim/gui_menu_builder.py:615
 msgid "Invite Contacts"
-msgstr "_Kontakte einladen"
+msgstr "Kontakte einladen"
 
-#: gajim/gui_menu_builder.py:613
-#, fuzzy
+#: gajim/gui_menu_builder.py:616
 msgid "Add to Roster"
-msgstr "Zur Kont_aktliste hinzufügen"
+msgstr "Zur Kontaktliste hinzufügen"
 
-#: gajim/gui_menu_builder.py:614
-#, fuzzy
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
-msgstr "Audiotest"
+msgstr "Audiositzung"
 
-#: gajim/gui_menu_builder.py:615
-#, fuzzy
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
-msgstr "Videotest"
+msgstr "Videositzung"
 
-#: gajim/gui_menu_builder.py:616
-#, fuzzy
+#: gajim/gui_menu_builder.py:619
 msgid "Information"
-msgstr "_Informationen"
+msgstr "Informationen"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
-#, fuzzy
 msgid "History"
-msgstr "_Verlauf"
+msgstr "Unterhaltungsverlauf"
 
-#: gajim/gui_menu_builder.py:635
-#, fuzzy
+#: gajim/gui_menu_builder.py:644
 msgid "Manage Room"
-msgstr "Chatraum _verwalten"
+msgstr "Gruppenchat verwalten"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
+#: gajim/gui_menu_builder.py:645
 msgid "Change Subject"
-msgstr "_Thema ändern …"
+msgstr "_Thema ändern"
 
-#: gajim/gui_menu_builder.py:637
-#, fuzzy
+#: gajim/gui_menu_builder.py:646
 msgid "Configure Room"
-msgstr "Chat_raum einrichten …"
+msgstr "_Gruppenchat konfigurieren"
 
-#: gajim/gui_menu_builder.py:638
-#, fuzzy
+#: gajim/gui_menu_builder.py:647
 msgid "Destroy Room"
-msgstr "_Chatraum auflösen"
+msgstr "Gruppenchat auflösen"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
+#: gajim/gui_menu_builder.py:649
 msgid "Change Nick"
-msgstr "Spitz_name ändern …"
+msgstr "Spitz_name ändern"
 
-# TODO: Synchronize with other strings concerning bookmarks
-#: gajim/gui_menu_builder.py:641
-#, fuzzy
+#: gajim/gui_menu_builder.py:650
 msgid "Bookmark Room"
-msgstr "Diesen _Chatraum merken"
+msgstr "Gruppenchat speichern"
 
-#: gajim/gui_menu_builder.py:642
-#, fuzzy
+#: gajim/gui_menu_builder.py:651
 msgid "Request Voice"
-msgstr "Stimme anfo_rdern"
+msgstr "Stimme anfordern"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
-#, fuzzy
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
-msgstr "Voreingestellte Nachrichten:"
+msgstr "Benachrichtigung bei allen Meldungen"
 
-#: gajim/gui_menu_builder.py:644
-#, fuzzy
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
-msgstr "Beim Schließen _minimieren"
+msgstr "Beim Schließen minimieren"
 
-#: gajim/gui_menu_builder.py:646
-#, fuzzy
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+msgid "Execute command"
+msgstr "Befehl ausführen"
+
+#: gajim/gui_menu_builder.py:656
 msgid "Disconnect"
-msgstr "_Verbindung trennen"
+msgstr "Verbindung trennen"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
-msgstr "Chatraum betreten"
+msgstr "Gruppenchat beitreten"
 
-#: gajim/gui_menu_builder.py:721
-#, fuzzy
+#: gajim/gui_menu_builder.py:731
 msgid "Add Contact..."
-msgstr "Kont_akt hinzufügen …"
+msgstr "Kont_akt hinzufügen"
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
-#, fuzzy
 msgid "Profile"
-msgstr "Datei"
+msgstr "Profil und Avatar"
 
-#: gajim/gui_menu_builder.py:724
-#, fuzzy
+#: gajim/gui_menu_builder.py:734
 msgid "Discover Services"
-msgstr "_Dienste durchsuchen"
+msgstr "Dienste durchsuchen"
 
-#: gajim/gui_menu_builder.py:725
-#, fuzzy
+#: gajim/gui_menu_builder.py:735
 msgid "Send Single Message..."
-msgstr "Einzelne _Nachricht senden …"
+msgstr "Einzelne _Nachricht senden..."
 
-#: gajim/gui_menu_builder.py:727
-#, fuzzy
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: gajim/gui_menu_builder.py:737
 msgid "Archiving Preferences"
-msgstr "Archi_veinstellungen bearbeiten"
+msgstr "Archiveinstellungen bearbeiten"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
-#, fuzzy
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 msgid "Synchronise History"
-msgstr "Synchronisieren"
+msgstr "Unterhaltungsverlauf synchronisieren"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
-#, fuzzy
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 msgid "Server Info"
-msgstr "Server"
+msgstr "Server-Informationen"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML-Konsole"
 
-#: gajim/gui_menu_builder.py:734
-#, fuzzy
+#: gajim/gui_menu_builder.py:743
+msgid "Admin"
+msgstr "Admin"
+
+#: gajim/gui_menu_builder.py:744
 msgid "Send Server Message..."
-msgstr "Servernachricht _senden …"
+msgstr "Servernachricht _senden…"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
-msgstr "Nachricht des Tages (MOTD) setzen …"
+msgstr "Nachricht des Tages (MOTD) setzen…"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
-msgstr "Nachricht des Tages (MOTD) aktualisieren …"
+msgstr "Nachricht des Tages (MOTD) aktualisieren…"
 
-#: gajim/gui_menu_builder.py:737
-#, fuzzy
+#: gajim/gui_menu_builder.py:747
 msgid "Delete MOTD..."
-msgstr "Nachricht des Tages (MOTD) _löschen"
+msgstr "Nachricht des Tages (MOTD) _löschen..."
 
-#: gajim/gui_menu_builder.py:777
-#, fuzzy
+#: gajim/gui_menu_builder.py:787
 msgid "No Accounts available"
-msgstr "Kein Konto vorhanden"
+msgstr "Keine Konten vorhanden"
+
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Konten"
 
-#: gajim/history_manager.py:57
+#: gajim/history_manager.py:56
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 msgid "Options:"
 msgstr "Optionen:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr "Diese Nachricht anzeigen und beenden"
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr "Verzeichnis für Log-Datei auswählen"
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
-msgstr "Kann Verlaufs-Datenkbank nicht finden"
+msgstr "Kann die Datenbank mit den Unterhaltungsverläufen nicht finden"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "Jabber-ID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Nachricht"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Thema"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -867,8 +879,7 @@ msgstr ""
 "Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE "
 "LÄUFT)"
 
-#: gajim/history_manager.py:243
-#, fuzzy
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -880,97 +891,95 @@ msgstr ""
 "wiederverwendbar. Wenn Sie den Speicherplatz wirklich reduzieren möchten, "
 "klicken Sie JA, ansonsten NEIN.\n"
 "\n"
-"Falls Sie JA klicken, warten Sie danach bitte einen Augenblick …"
+"Falls Sie JA klicken, warten Sie danach bitte einen Augenblick…"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr "Datenbank aufräumen"
 
-#: gajim/history_manager.py:463
-#, fuzzy
+#: gajim/history_manager.py:462
 msgid "Exporting History Logs…"
-msgstr "Exportiere Verlauf..."
+msgstr "Exportiere Unterhaltungsverlauf…"
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s sagte um %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:577
-#, fuzzy, python-format
+#: gajim/history_manager.py:576
+#, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
-msgstr "Möchten Sie den Verlauf von %(jid)s wirklich löschen?"
+msgstr ""
+"Möchten Sie den gesamten Unterhaltungsverlauf mit %(jid)s wirklich löschen?"
 
-#: gajim/history_manager.py:581
-#, fuzzy
+#: gajim/history_manager.py:580
 msgid "Do you wish to delete all correspondence with the selected contacts?"
-msgstr "Möchten Sie wirklich den Verlauf des ausgewählten Kontakts löschen?"
+msgstr ""
+"Möchten Sie den Unterhaltungsverlauf des ausgewählten Kontakts wirklich "
+"löschen?"
 
-#: gajim/history_manager.py:583
-#, fuzzy
+#: gajim/history_manager.py:582
 msgid "This can not be undone."
-msgstr "Der Dienst konnte nicht gefunden werden"
+msgstr "Dieser Schritt kann nicht rückgängig gemacht werden."
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr "Löschbestätigung"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
 msgstr[1] "Möchten Sie die ausgewählten Nachrichten wirklich löschen?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Dies ist ein unwiderruflicher Vorgang."
 
-#: gajim/profile_window.py:66
-#, fuzzy
+#: gajim/profile_window.py:63
 msgid "Retrieving profile…"
-msgstr "Empfange Profil..."
+msgstr "Empfange Profil…"
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "Falsches Datumsformat"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Datumsformat muss JJJJ-MM-TT entsprechen"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informationen empfangen"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden."
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Ohne verbunden zu sein, können sie keine Kontaktinformationen publizieren."
 
-#: gajim/profile_window.py:351
-#, fuzzy
+#: gajim/profile_window.py:349
 msgid "Sending profile…"
-msgstr "Sende Profil …"
+msgstr "Sende Profil…"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informationen NICHT veröffentlicht"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Veröffentlichung der vCard fehlgeschlagen"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -984,14 +993,14 @@ msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
 #: gajim/dialogs.py:97
-#, fuzzy, python-format
+#, python-format
 msgid "JID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Allgemein"
@@ -1027,7 +1036,7 @@ msgstr "Statusnachricht"
 
 #: gajim/dialogs.py:818
 msgid "Overwrite Status Message?"
-msgstr "Statusnachricht überschreiben"
+msgstr "Statusnachricht überschreiben?"
 
 #: gajim/dialogs.py:819
 msgid ""
@@ -1042,127 +1051,125 @@ msgstr "Als Vorlage für Statusnachrichten speichern"
 
 #: gajim/dialogs.py:828
 msgid "Please type a name for this status message"
-msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
+msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein"
 
 #: gajim/dialogs.py:855
-#, fuzzy
 msgid "JID:"
-msgstr "Ihre Jabber-ID:"
+msgstr "Jabber-ID:"
 
 #: gajim/dialogs.py:856
 msgid "AIM Address:"
-msgstr "AIM-Adresse"
+msgstr "AIM-Adresse:"
 
 #: gajim/dialogs.py:857
 msgid "GG Number:"
-msgstr "GG-Nummer"
+msgstr "GG-Nummer:"
 
 #: gajim/dialogs.py:858
 msgid "ICQ Number:"
-msgstr "ICQ-Nummer"
+msgstr "ICQ-Nummer:"
 
 #: gajim/dialogs.py:859
 msgid "MSN Address:"
-msgstr "MSN-Adresse"
+msgstr "MSN-Adresse:"
 
 #: gajim/dialogs.py:860
 msgid "Yahoo! Address:"
-msgstr "Yahoo-Adresse"
+msgstr "Yahoo-Adresse:"
 
 #: gajim/dialogs.py:897
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Please fill in the data of the contact you want to add to your account <b>"
 "%s</b>"
 msgstr ""
-"Bitte geben Sie die Daten für den Kontakt, den Sie dem Konto <b>%s</b> "
-"hinzufügen möchten ein"
+"Bitte geben Sie die Daten für den Kontakt ein, den Sie dem Konto <b>%s</b> "
+"hinzufügen möchten"
 
 #: gajim/dialogs.py:900
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
-msgstr "Die Benutzer-ID darf keine Ressource enthalten."
+msgstr "Die Benutzer-ID darf keine XMPP-Ressource enthalten."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakt bereits in der Kontaktliste"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: gajim/dialogs.py:1277
-#, fuzzy
+#: gajim/dialogs.py:1272
 msgid "Error while adding transport contact"
-msgstr "Fehler beim Hinzufügen des Dienstes. %s"
+msgstr "Fehler beim Hinzufügen des Transport-Dienstes"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
+"Folgender Fehler trat auf beim Hinzufügen eines Kontaktes zum Transport "
+"%(transport)s:\n"
+"\n"
+"%(error)s"
 
-#: gajim/dialogs.py:1310
-#, fuzzy
+#: gajim/dialogs.py:1305
 msgid "A GTK+ XMPP client"
 msgstr "Ein Jabber/XMPP-Client in GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+-Version: %s"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGObject-Version: %s"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr "python-nbxmpp Version: %s"
 
-#: gajim/dialogs.py:1316
-#, fuzzy
+#: gajim/dialogs.py:1311
 msgid "Current Developers"
-msgstr "Derzeitige Entwickler:"
+msgstr "Derzeitige Entwickler"
 
-#: gajim/dialogs.py:1317
-#, fuzzy
+#: gajim/dialogs.py:1312
 msgid "Past Developers"
-msgstr "Frühere Entwickler:"
+msgstr "Frühere Entwickler"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
-msgstr ""
+msgstr "Künstler"
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
-msgstr ""
+msgstr "Zu guter Letzt"
 
-#: gajim/dialogs.py:1323
-#, fuzzy
+#: gajim/dialogs.py:1318
 msgid "we would like to thank all the package maintainers."
-msgstr "Zuletzt möchten wird gerne allen Paket-Verwaltern danken."
+msgstr "möchten wir gerne allen Paket-Verwaltern danken."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
@@ -1172,12 +1179,12 @@ msgstr ""
 "Nico Gulden (cilugnedon AT gmx.de)\n"
 "Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, python-format
-msgid "Dictionary for lang \"%s\" not available"
-msgstr "Kein Wörterburch für die Sprache \"%s\" verfügbar"
+msgid "Dictionary for language \"%s\" not available"
+msgstr "Kein Wörterbuch für die Sprache \"%s\" verfügbar"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1186,17 +1193,18 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 "Sie müssen das Wörterbuch \"%s\" installieren oder eine andere Sprache "
-"wählen, um die Rechtschreibprüfung nutzen zu können.\n"
+"wählen (durch die Einstellung \"speller_language\"), um die "
+"Rechtschreibprüfung nutzen zu können.\n"
 "\n"
-"Falsch geschriebene Wörter können nicht hervorgehoben werden."
+"Die Hervorhebung falsch geschriebener Wörter wird nicht funktionieren."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: gajim/dialogs.py:1839
-#, fuzzy, python-format
+#: gajim/dialogs.py:1834
+#, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
 "This means conversations will not be encrypted, and is strongly "
@@ -1205,501 +1213,513 @@ msgid ""
 msgstr ""
 "Sie sind dabei, eine ungesicherte Verbindung für das Konto %(account)s "
 "(%(server)s) aufzubauen. Das bedeutet, dass alle Unterhaltungen "
-"unverschlüsselt übertragen werden. Von dieser Art der Verbindung wird "
-"dringend abgeraten.\n"
+"unverschlüsselt übertragen werden, wovon dringend abgeraten wird.\n"
 "Sind Sie sicher, dass Sie fortwahren wollen?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
-"Gajim wird sich NICHT verbinden falls dieser Kasten nicht ausgewählt ist"
+"Gajim wird sich NICHT verbinden, wenn Sie diese Option nicht aktivieren"
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "Fo_rtsetzen"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "Er_setzen"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 msgid "The nickname contains invalid characters."
 msgstr "Der Spitzname enthält ungültige Zeichen."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Abonnementanfrage"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnement-Anfrage für das Konto %(account)s von %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anfrage von %s"
 
-#: gajim/dialogs.py:2364
-#, fuzzy
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 msgid "Join Groupchat"
-msgstr "Chatraum betreten"
+msgstr "Gruppenchat beitreten"
 
-#: gajim/dialogs.py:2506
-#, fuzzy
+#: gajim/dialogs.py:2500
 msgid "Invalid Room"
-msgstr "Ungültiger Raum"
+msgstr "Ungültiger Gruppenchat"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
-msgstr "Bitte wählen sie einen Raum aus"
+msgstr "Bitte wählen sie einen Gruppenchat aus"
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: gajim/dialogs.py:2520
-#, fuzzy
+#: gajim/dialogs.py:2514
 msgid "Please choose a nickname"
-msgstr "Bitte erstellen Sie ein neues leeres Design mit dem gewünschten Namen."
+msgstr "Bitte wählen Sie einen Spitznamen"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Ungültige Jabber-ID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
-msgstr "Sie können einen Chatraum erst betreten, wenn Sie verbunden sind."
+msgstr "Sie können einem Gruppenchat erst beitreten, wenn Sie verbunden sind."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 msgid "Wrong server"
 msgstr "Falscher Server"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, python-format
 msgid "%s is not a groupchat server"
-msgstr "%s ist kein Chatraumserver"
+msgstr "%s ist kein Gruppenchat-Server"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sie müssen verbunden sein, um Ihre Kontakte synchronisieren zu können."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Name"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Dieses Konto ist nicht mit dem Server verbunden"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: gajim/dialogs.py:2778
-#, fuzzy
+#: gajim/dialogs.py:2772
 msgid "Start new Conversation"
-msgstr "Unterhaltung fortsetzen"
+msgstr "Neue Unterhaltung starten"
 
-#: gajim/dialogs.py:3033
-#, fuzzy
+#: gajim/dialogs.py:3028
 msgid "New Groupchat"
 msgstr "Neuer Gruppenchat"
 
-#: gajim/dialogs.py:3035
-#, fuzzy
+#: gajim/dialogs.py:3030
 msgid "New Contact"
-msgstr "Neuen Kontakt hinzufügen"
+msgstr "Neuer Kontakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort ändern zu können."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Dateiübertragungsfehler"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung beendet"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Von %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 "Die Nachricht kann nicht an %s gesendet werden. Die Jabber-ID ist ungültig."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+msgid "Clear"
+msgstr "Leeren"
+
+#: gajim/dialogs.py:3563
+msgid "Filter"
+msgstr "Filter"
+
+#: gajim/dialogs.py:3568
+msgid "XML Input"
+msgstr "<b>XML-Direkteingabe</b>"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Senden"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "hinzufügen"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "Verändern"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "Entfernen"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr ""
-"<b>%(jid)s</b> möchte gerne einige Kontakte in deiner Kontaktliste <b>"
+"<b>%(jid)s</b> möchte gerne einige Kontakte in Ihrer Kontaktliste <b>"
 "%(action)s</b>."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Verändern"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Löschen"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Gruppen"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 "%s hat mir vorgeschlagen Sie als Kontakt zu meiner Kontaktliste hinzuzufügen."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "%d Kontakt hinzugefügt"
 msgstr[1] "%d Kontakte hinzugefügt"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "%d Kontakt entfernt"
 msgstr[1] "%d Kontakte entfernt"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Archiveinstellungen für %s"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr "Erfolgreich!"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Your Archiving Preferences have been saved!"
 msgstr "Archiveinstellungen wurden gespeichert!"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr "Keine Antwort vom Server"
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr "Ein Fehler ist aufgetreten: {}"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 msgid "Error!"
 msgstr "Fehler!"
 
-#: gajim/dialogs.py:4117
-#, fuzzy
+#: gajim/dialogs.py:4120
 msgid "Add JID"
 msgstr "Jabber-ID hinzufügen"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatsphären-Liste <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Privatsphären-Liste"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Sortierung: %(order)s, Aktion: %(action)s, Typ: %(type)s, Wert: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 "Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
 "können."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
-msgstr "Sie wurden in einen Chatraum eingeladen"
+msgstr "Sie wurden in einen Gruppenchat eingeladen"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
-msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
+msgstr "$Contact hat Sie in einen Gruppenchat eingeladen"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
-msgstr "$Contact hat Sie in den Chatraum %(room_jid)s eingeladen"
+msgstr "$Contact hat Sie in den Gruppenchat %(room_jid)s eingeladen"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr "Grund (falls Sie ablehnen):"
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "Clientzertifikat #PCKS12 auswählen"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "PKCS12 Dateien"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
-msgstr "Sound wählen"
+msgstr "Klang auswählen"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav-Dateien"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Bilder"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "Archiv auswählen"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "Dateien packen"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "eine Audio und Video"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "eine Audio"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "eine Video"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
-"%(contact)s möchte eine %(type)s-Sitzung mit dir starten. Möchten Sie den "
+"%(contact)s möchte eine %(type)s-Sitzung mit Ihnen starten. Möchten Sie den "
 "Anruf annehmen?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr "Zertifikat für das Konto %s"
 
-#: gajim/dialogs.py:5339
-#, fuzzy, python-format
+#: gajim/dialogs.py:5333
+#, python-format
 msgid ""
 "<b>Issued to:</b>\n"
 "Common Name (CN): %(scn)s\n"
@@ -1736,331 +1756,358 @@ msgstr ""
 "Ausgestellt am: %(io)s\n"
 "Läuft ab am: %(eo)s\n"
 "\n"
-"<b>Fingerprint</b>\n"
-"SHA1-Fingerprint: %(sha1)s\n"
+"<b>Fingerabdruck</b>\n"
+"SHA-1-Fingerabdruck: %(sha1)s\n"
 "\n"
-"SHA256-Fingerprint: %(sha256)s\n"
+"SHA256-Fingerabdruck: %(sha256)s\n"
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL-Zertifikatprüfung für %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
-#, fuzzy
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
-msgstr "Zertifikat anzeigen..."
+msgstr "Zertifikat anzeigen…"
+
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+msgid "File Transfer"
+msgstr "Dateiübertragungen"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr "Fordere Slot für den HTTP Datei-Upload an..."
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr "Sende die Datei via HTTP Datei-Upload..."
+
+#: gajim/dialogs.py:5446
+msgid "Encrypting file..."
+msgstr "Datei wird verschlüsselt..."
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s heißt jetzt %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
-"Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat "
-"den Chatraum verlassen."
+"Entweder sind Sie nicht mehr im Gruppenchat \"%(room)s\" oder \"%(nick)s\" "
+"hat den Gruppenchat verlassen."
+
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr "HTTP Datei-Upload"
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr "HTTP Datei-Upload wird von Ihrem Server nicht unterstützt"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
-msgstr "Bitte wählen Sie ein neues Thema"
+msgstr "Bitte wählen Sie ein neues Thema:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
 
-#: gajim/groupchat_control.py:620
-#, fuzzy
+#: gajim/groupchat_control.py:677
 msgid "Invalid group chat JID"
-msgstr "Ungültige Jabber-ID für den Chatraum"
+msgstr "Ungültige Jabber-ID für den Gruppenchat"
 
-#: gajim/groupchat_control.py:621
-#, fuzzy
+#: gajim/groupchat_control.py:678
 msgid "The group chat JID has not allowed characters."
-msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
+msgstr "Die Jabber-ID des Gruppenchats enthält ungültige Zeichen."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
-msgstr "Lösche %s"
+msgstr "Löse Gruppenchat %s auf"
 
-#: gajim/groupchat_control.py:628
-#, fuzzy
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
-"Der Chatraum wird endgültig gelöscht.\n"
-"Sie können hier einen Grund angeben:"
+"Der Gruppenchat wird hiermit endgültig gelöscht.\n"
+"Sie können einen Grund angeben:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
-msgstr "Sie können auch einen alternativen Chatraum eintragen:"
+msgstr "Sie können auch einen alternativen Gruppenchat eintragen:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "und NICHT authentifiziert"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
+#, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
-msgstr ""
-"%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
-"Ihre Chatsitzung %(logged)s mitgeschrieben."
+msgstr "%(type)s Verschlüsselung aktiv %(authenticated)s."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s hat das Thema in %(subject)s geändert"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
-msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
+msgstr ""
+"Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen (de-anonymisiert)"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
-msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
+msgstr "Der Gruppenchat zeigt nun abwesende Teilnehmer an"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
-msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
+msgstr "Der Gruppenchat zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 "Es wurde eine Einstellung verändert, die nicht die Privatsphäre betrifft"
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
-msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
+msgstr "Die Gruppenchat-Aufzeichnung ist jetzt aktiviert"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
-msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
+msgstr "Die Gruppenchat-Aufzeichnung ist jetzt deaktiviert"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
-msgstr "Der Chatraum ist jetzt nicht mehr anonym"
+msgstr "Der Gruppenchat ist jetzt de-anonymisiert"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
-msgstr "Der Chatraum ist jetzt semi-anonym"
+msgstr "Der Gruppenchat ist jetzt semi-anonym"
 
-#: gajim/groupchat_control.py:1426
-#, fuzzy
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
-msgstr "Der Chatraum ist jetzt komplett anonym"
+msgstr "Der Gruppenchat ist jetzt vollständig anonym"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
-msgstr "%(jid)s wurde in diesen Chatraum eingeladen"
+msgstr "%(jid)s wurde in diesen Gruppenchat eingeladen"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
-msgstr "Chatraum-Aufzeichnung ist aktiviert"
+msgstr "Gruppenchat-Aufzeichnung ist aktiviert"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
-msgstr "Ein neuer Chatraum wurde erstellt"
+msgstr "Ein neuer Gruppenchat wurde erstellt"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
-msgstr "Der Server hat Ihren Chatraum-Nick zugewiesen oder verändert"
+msgstr "Der Server hat Ihren Gruppenchat-Spitznamen zugewiesen oder verändert"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
-msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
+msgstr ""
+"%(nick)s wurde aus dem Gruppenchat geworfen. Der Grund dafür: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
-"%(nick)s wurde von %(who)s aus dem Chatraum geworfen. Grund: %(reason)s"
+"%(nick)s wurde von %(who)s aus dem Gruppenchat geworfen. Der Grund dafür: "
+"%(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt. Grund: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s gebannt. Grund: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
-msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
+msgstr "%(nick)s wurde aus dem Gruppenchat geworfen (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
-msgstr "Zugehörigkeit geändert:"
+msgstr "Gruppenzugehörigkeit geändert"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
-msgstr ""
-"Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
+msgstr "Gruppenchat-Einstellung wurde auf \"nur für Mitglieder\" geändert"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "Computer wird heruntergefahren"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
-"** Mitgliedschaft von %(nick)s wurde von %(actor)s auf %(affiliation)s "
-"gesetzt"
+"** Gruppenzugehörigkeit von %(nick)s wurde durch %(actor)s auf "
+"%(affiliation)s gesetzt"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
-msgstr "** Mitgliedschaft von %(nick)s wurde an %(affiliation)s gesendet"
+msgstr "** Gruppenzugehörigkeit von %(nick)s wurde auf %(affiliation)s gesetzt"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Die Rolle von %(nick)s wurde durch %(actor)s in %(role)s geändert"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Die Rolle von %(nick)s wurde in %(role)s geändert"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
-msgstr "%s hat den Chatraum betreten"
+msgstr "%s ist dem Gruppenchat beigetreten"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
-msgstr "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
+msgstr "Möchten Sie den Gruppenchat \"%s\" wirklich verlassen?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
-"Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Chatraum "
+"Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Gruppenchat "
 "geschlossen."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rauswerfen"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+msgid "Jingle File Transfer"
+msgstr "Dateiübertragung via Jingle"
+
+#: gajim/chat_control.py:331
+msgid "No File Transfer available"
+msgstr "Keine Dateiübertragung vorhanden"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Schriftformatierung (Alt+M)"
 
-#: gajim/chat_control.py:371
-#, fuzzy
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
-msgstr "Formatierung nicht verfügbar wenn GPG aktiv ist."
+msgstr "Formatierung ist nicht verfügbar, wenn GPG aktiv ist."
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
 msgstr "Der Kontakt unterstützt keine HTML"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s Status: %(state)s, Grund: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname)s aus dem Chatraum %(room_name)s"
+msgstr "%(nickname)s aus dem Gruppenchat %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Sitzungsaushandlung abgebrochen"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "Diese Sitzung WIRD auf dem Server archiviert"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "Diese Sitzung WIRD NICHT auf dem Server archiviert"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Diese Sitzung ist verschlüsselt"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
-msgstr " und WIRD aufgezeichnet"
+msgstr " und der Unterhaltungsverlauf WIRD gespeichert"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
-msgstr " und wird NICHT AUFGEZEICHNET"
+msgstr " und der Unterhaltungsverlauf WIRD NICHT gespeichert"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2068,24 +2115,24 @@ msgstr ""
 "Die Identität des Gesprächspartners wurde nicht überprüft. Mehr "
 "Informationen durch Klicken auf das Schild-Symbol."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E-Verschlüsselung deaktiviert"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
-"Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
-"Nachricht verloren."
+"Wenn Sie das Fenster schließen und der Unterhaltungsverlauf abgeschaltet "
+"ist, geht diese Nachricht verloren."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2094,7 +2141,7 @@ msgstr ""
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2103,94 +2150,92 @@ msgstr ""
 "Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
 "Eventuell wurde sie verändert."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 msgid "File transfer"
 msgstr "Dateiübertragung"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr "Größe"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr "_Akzeptieren"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Betreten"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
-msgstr "Entfernter Kontakt unterbrach die Dateiübertragung"
+msgstr "Ihr Kontakt hat die Dateiübertragung angehalten"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
-msgstr "Fehler beim Öffnen der Datei:"
+msgstr "Fehler beim Öffnen der Datei"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
-msgstr "Gruppenchat"
-
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+msgstr "Gruppenchats"
+
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transporte"
 
-#: gajim/roster_window.py:2033
-#, fuzzy
+#: gajim/roster_window.py:2045
 msgid "Authorization sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: gajim/roster_window.py:2034
-#, fuzzy, python-format
+#: gajim/roster_window.py:2046
+#, python-format
 msgid "\"%s\" will now see your status."
-msgstr "\"%s\" kennt jetzt Ihren Status."
+msgstr "\"%s\" sieht jetzt Ihren Status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Wenn \"%s\" diese Anfrage akzeptiert, können Sie seinen/ihren Status sehen."
 
-#: gajim/roster_window.py:2072
-#, fuzzy
+#: gajim/roster_window.py:2084
 msgid "Authorization removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr "GPG ist nicht benutzbar"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2201,39 +2246,39 @@ msgstr ""
 "Achtung, es gibt ein inkompatibles Python-Paket mit dem Namen gnupg.\n"
 "Sie werden ohne OpenPGP zu %s verbunden."
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 "Wenn Sie Ihren Status auf unsichtbar setzen, werden Sie von diesen "
-"Chaträumen getrennt. Sind Sie sicher, dass Sie unsichtbar werden möchten?"
+"Gruppenchats getrennt. Sind Sie sicher, dass Sie unsichtbar werden möchten?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "Nicht synchronisiert"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Gajim wirklich beenden?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Möchten Sie Gajim wirklich verlassen?"
+msgstr "Möchten Sie Gajim wirklich beenden?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Gajim immer schließen"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "Sie haben laufende Dateiübertragungen"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
@@ -2241,28 +2286,29 @@ msgstr ""
 "Wenn Sie jetzt beenden, werden die laufenden Dateiübertragungen abgebrochen. "
 "Möchten Sie dennoch beenden?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr ""
-"Nachrichten sind nur für das spätere Lesen verfügbar, wenn der Verlauf "
-"aktiviert wurde und der Kontakt sich in der Kontaktliste befindet."
+"Nachrichten sind nur für das spätere Lesen verfügbar, wenn der "
+"Unterhaltungsverlauf aktiviert wurde und der Kontakt sich in der "
+"Kontaktliste befindet."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
-msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
+msgstr "Sie müssen sie lesen, bevor der Transport entfernt wird."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Der Transport \"%s\" wird entfernt"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2270,11 +2316,11 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport "
 "austauschen."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2283,13 +2329,12 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diese Transporte "
 "austauschen: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Sie sind dabei, einen Kontakt zu blockieren. Wollen Sie wirklich fortfahren?"
 
-#: gajim/roster_window.py:2881
-#, fuzzy
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
@@ -2297,72 +2342,70 @@ msgstr ""
 "Der Kontakt wird Sie als offline sehen und Sie werden von ihm keine "
 "Nachrichten empfangen, die er Ihnen sendet."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Geben Sie einen Spitznamen für den Kontakt %s ein"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Geben Sie einen neuen Namen für die Gruppe %s ein"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Möchten Sie wirklich die Gruppe %s von Ihrer Kontaktliste entfernen?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Auch alle Kontakte dieser Gruppe von Ihrer Kontaktliste entfernen"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Sie sind dabei, \"%(name)s\" (%(jid)s) aus der Kontaktliste zu entfernen.\n"
 
-#: gajim/roster_window.py:3432
-#, fuzzy
+#: gajim/roster_window.py:3443
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
 "always seeing you as offline."
 msgstr ""
-"Durch das Entfernen dieser Kontakte:%s\n"
-"entziehen Sie ihnen auch die Berechtigung, Ihren Status zu sehen, wodurch "
-"die Kontakte Sie nur noch als offline sehen werden."
+"Durch das Entfernen des Kontakts entziehen Sie diesem auch die Berechtigung, "
+"Ihren Status zu sehen, wodurch die Kontakte Sie nur noch als offline sehen "
+"werden."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
-msgstr "Möchten Sie fortsetzen?"
+msgstr "Möchten Sie fortfahren?"
 
-#: gajim/roster_window.py:3442
-#, fuzzy
+#: gajim/roster_window.py:3453
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in them always seeing you as offline."
@@ -2371,16 +2414,16 @@ msgstr ""
 "Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
 "offline sehen wird."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2390,15 +2433,15 @@ msgstr ""
 "entziehen Sie ihnen auch die Berechtigung, Ihren Status zu sehen, wodurch "
 "die Kontakte Sie nur noch als offline sehen werden."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"Sie sind dabei, einen angepassten Status zu senden. Wollen Sie wirklich "
-"fortfahren?"
+"Sie sind dabei, einen benutzerdefinierten Status zu senden. Wollen Sie "
+"wirklich fortfahren?"
 
-#: gajim/roster_window.py:3514
-#, fuzzy, python-format
+#: gajim/roster_window.py:3525
+#, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
@@ -2406,27 +2449,28 @@ msgstr ""
 "Dieser Kontakt wird Sie vorläufig als %(status)s sehen, aber nur bis Sie "
 "Ihren Status ändern. Dann wird er Ihren globalen Status sehen."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden "
 "können."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
-msgstr "Sie können einen Chatraum nicht betreten, wenn Sie unsichtbar sind."
+msgstr ""
+"Sie können einem Gruppenchat nicht beitreten, wenn Sie unsichtbar sind."
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -2435,210 +2479,202 @@ msgstr ""
 "Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
 "gespeichert."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
 "fortfahren?"
 
-#: gajim/roster_window.py:4267
-#, fuzzy
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
 msgstr ""
-"Metakontakte sind eine Möglichkeit, mehrere Kontakte in einer Zeile zu "
-"gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere "
-"Jabber- oder Transport-Konten hat."
+"Metakontakte bieten die Möglichkeit, mehrere Kontakte in einer Zeile zu "
+"gruppieren. Sie werden normalerweise dann verwendet, wenn dieselbe Person "
+"mehrere XMPP-Konten oder Transport-Konten hat."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Wollen Sie die Datei an %s senden?"
 msgstr[1] "Wollen Sie die Dateien an %s senden?"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Sende %(from)s an %(to)s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s zum ersten Kontakt machen"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
-msgstr "%(contact1)s und %(contact2)s zu Metakontakt zusammenführen"
+msgstr "%(contact1)s und %(contact2)s zu einem Metakontakt zusammenführen"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
-msgstr "Position veröffentlichen"
+msgstr "Standort veröffentlichen"
 
-#: gajim/roster_window.py:4989
-#, fuzzy
+#: gajim/roster_window.py:4997
 msgid "Configure Services…"
-msgstr "Dienste konfigurieren …"
+msgstr "Dienste konfigurieren…"
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
-#: gajim/roster_window.py:5313
-#, fuzzy
+#: gajim/roster_window.py:5321
 msgid "Edit _Groups…"
-msgstr "_Gruppen bearbeiten"
+msgstr "_Gruppen bearbeiten…"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "Wieder ve_rbinden"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
-msgstr "_Verlauf"
+msgstr "_Unterhaltungsverlauf"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
-msgstr "_Chatraum betreten …"
+msgstr "_Neuem Gruppenchat beitreten"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "Ändere _Statusnachricht"
-
-#: gajim/gajim.py:68
-#, fuzzy
+#: gajim/gajim.py:72
 msgid "Show the application's version"
-msgstr "Benachrichtigungssymbol anzeigen:"
+msgstr "Version der Anwendung anzeigen"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 msgid "Show only critical errors"
 msgstr "Nur kritische Fehler anzeigen"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
-"Profildateien vollständig trennen (auch Verlaufs-Datenbank und Plugins)"
+"Profildateien vollständig trennen (auch die Datenbank für "
+"Unterhaltungsverläufe und die Plugins)"
 
-#: gajim/gajim.py:78
-#, fuzzy
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr "XML stanzas und andere Debuginformationen anzeigen"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 msgid "Use defined profile in configuration directory"
-msgstr "Definiertes Profit im Konfigurationsverzeichnis verwenden"
+msgstr "Im Konfigurationsverzeichnis definiertes Profil verwenden"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 msgid "Set configuration directory"
 msgstr "Konfigurationsverzeichnis setzen"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr "Logging-System konfigurieren"
 
-#: gajim/gajim.py:92
-#, fuzzy
+#: gajim/gajim.py:96
 msgid "Show all warnings"
-msgstr "Zeige alle neuen _Ereignisse"
+msgstr "Zeige alle Warnungen"
+
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr "Öffne iPython-Shell"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: gajim/history_sync.py:220
-#, fuzzy
+#: gajim/history_sync.py:217
 msgid "How far back do you want to go?"
-msgstr "Was möchten Sie tun?"
+msgstr "Wie weit möchten Sie zurückgehen?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr "Ein Monat"
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr "Drei Monate"
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr "Ein Jahr"
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr "Alles"
 
-#: gajim/history_sync.py:257
-#, fuzzy
+#: gajim/history_sync.py:254
 msgid "Connecting..."
-msgstr "Verbindung wird hergestellt"
+msgstr "Verbindung wird hergestellt..."
 
-#: gajim/history_sync.py:269
-#, fuzzy, python-format
+#: gajim/history_sync.py:266
+#, python-format
 msgid "%(received)s of %(max)s"
-msgstr ""
-"Die Übertragung der Datei %(filename)s von %(name)s ist fehlgeschlagen."
+msgstr "%(received)s empfangen von %(max)s"
 
-#: gajim/history_sync.py:273
-#, fuzzy, python-format
+#: gajim/history_sync.py:270
+#, python-format
 msgid "Downloaded %s Messages"
-msgstr "Ungelesene Nachrichten weiterleiten"
+msgstr "Es wurden %s Nachrichten heruntergeladen"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2647,11 +2683,11 @@ msgid ""
 "        "
 msgstr ""
 "\n"
-"        Synchronisierung der History abgeschlossen.\n"
+"        Synchronisierung des Unterhaltungsverlaufs abgeschlossen.\n"
 "        {received} Nachrichten heruntergeladen.\n"
 "        "
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2659,11 +2695,11 @@ msgid ""
 "        "
 msgstr ""
 "\n"
-"        Gajim ist vollständig synchronisiert\n"
-"        mit dem Archiv.\n"
+"        Gajim ist vollständig mit\n"
+"        dem Archiv synchronisiert.\n"
 "        "
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2732,9 +2768,8 @@ msgid "Role"
 msgstr "Rolle"
 
 #: gajim/config.py:1680
-#, fuzzy
 msgid "Banning…"
-msgstr "Verbannen …"
+msgstr "Verbannen…"
 
 #: gajim/config.py:1682
 msgid ""
@@ -2745,9 +2780,8 @@ msgstr ""
 "\n"
 
 #: gajim/config.py:1684
-#, fuzzy
 msgid "Adding Member…"
-msgstr "Mitglied hinzufügen …"
+msgstr "Mitglied hinzufügen…"
 
 #: gajim/config.py:1685
 msgid ""
@@ -2758,9 +2792,8 @@ msgstr ""
 "\n"
 
 #: gajim/config.py:1687
-#, fuzzy
 msgid "Adding Owner…"
-msgstr "Besitzer hinzufügen …"
+msgstr "Besitzer hinzufügen…"
 
 #: gajim/config.py:1688
 msgid ""
@@ -2771,9 +2804,8 @@ msgstr ""
 "\n"
 
 #: gajim/config.py:1690
-#, fuzzy
 msgid "Adding Administrator…"
-msgstr "Administrator hinzufügen …"
+msgstr "Administrator hinzufügen…"
 
 #: gajim/config.py:1691
 msgid ""
@@ -2792,13 +2824,13 @@ msgid ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain)."
 msgstr ""
-"Kann einen der folgenden Werte annehmen:\n"
-"1. benutzer@domain/resource (nur die angegebene Ressource trifft zu).\n"
-"2. benutzer@domain (jede Ressource trifft zu).\n"
-"3. domain/resource (nur die angegebene Ressource trifft zu).\n"
-"4. domain (sowohl die Domain selbst trifft zu als auch jeder benutzer@domain,"
-"\n"
-"jede domain/Ressource oder jede Adresse, die eine Subdomain enthält)."
+"In einem der folgenden Formate:\n"
+"1. benutzer@domain/resource (nur die angegebene XMPP-Ressource trifft zu).\n"
+"2. benutzer@domain (jede XMPP-Ressource trifft zu).\n"
+"3. domain/resource (nur die angegebene XMPP-Ressource trifft zu).\n"
+"4. domain (sowohl die Domain selbst trifft zu als auch jeder "
+"benutzer@domain,\n"
+"jede domain/XMPP-Ressource oder jede Adresse, die eine Subdomain enthält)."
 
 #: gajim/config.py:1792
 #, python-format
@@ -2813,16 +2845,16 @@ msgstr "Konto ist deaktiviert"
 msgid "To unregister from a server, account must be enabled."
 msgstr "Um sich vom Server abzumelden, muss das Konto aktiviert sein."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Passwort speichern"
 
@@ -2852,24 +2884,32 @@ msgstr "Kont_o nur aus Gajim entfernen"
 msgid "Don't remove anything. I'll try again later"
 msgstr "Bitte nichts entfernen. Ich versuche es später noch einmal"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "Jeden"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "Keinen"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
-# TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
 #: gajim/config.py:2051
 msgid "This bookmark has invalid data"
-msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
+msgstr "Dieser gespeicherte Gruppenchat beinhaltet ungültige Daten"
 
 #: gajim/config.py:2052
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
-"Bitte Server- und Chatraumfeld ausfüllen oder gespeicherten Chatraum löschen."
+"Bitte Server- und Gruppenchat-Feld ausfüllen oder den gespeicherten "
+"Gruppenchat löschen."
 
 #: gajim/config.py:2175 gajim/config.py:2191 gajim/config.py:2202
 #: gajim/config.py:2230
@@ -2882,7 +2922,7 @@ msgstr "Ungültiger Server"
 
 #: gajim/config.py:2229
 msgid "Invalid room"
-msgstr "Ungültiger Raum"
+msgstr "Ungültiger Gruppenchat"
 
 #: gajim/config.py:2393
 msgid "Account has been added successfully"
@@ -2894,9 +2934,9 @@ msgid ""
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
-"Sie können erweiterte Kontooptionen festlegen, indem Sie den Erweitert "
-"Button drücken, oder später den Eintrag Konto im Ändern Menü in der "
-"Kontaktliste auswählen."
+"Sie können erweiterte Kontooptionen festlegen, indem Sie auf Erweitert "
+"klicken, oder später den Eintrag Konto im Ändern Menü in der Kontaktliste "
+"auswählen."
 
 #: gajim/config.py:2399
 msgid "Your new account has been created successfully"
@@ -2923,11 +2963,11 @@ msgstr "Ungültiger Eintrag"
 msgid "Custom port must be a port number."
 msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Zertifikat bereits in der Datei"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2943,7 +2983,7 @@ msgid ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 msgstr ""
-"<B>Sicherheitswartnung</b>\n"
+"<b>Sicherheitswarnung</b>\n"
 "\n"
 "Möglicherweise ist das SSL-Zertifikat %(hostname)s nicht echt.\n"
 "SSL-Fehler: %(error)s\n"
@@ -2959,9 +2999,9 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 "Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n"
-"SHA1-Fingerprint des Zertifikates:\n"
+"SHA1-Fingerabdruck des Zertifikates:\n"
 "%(sha1)s\n"
-"SHA256-Fingerprint des Zertifikates:\n"
+"SHA256-Fingerabdruck des Zertifikates:\n"
 "%(sha256)s"
 
 #: gajim/config.py:2670 gajim/config.py:2704
@@ -3028,96 +3068,116 @@ msgstr "Nachricht gesendet"
 
 #: gajim/config.py:2996
 msgid "Group Chat Message Highlight"
-msgstr "Hervorhebung von Chatraum-Nachrichten"
+msgstr "Hervorhebung von Gruppenchat-Nachrichten"
 
 #: gajim/config.py:2997
 msgid "Group Chat Message Received"
-msgstr "Chatraum-Nachricht empfangen"
+msgstr "Gruppenchat-Nachricht empfangen"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
-msgstr "%(owner_or_admin_or_member)s dieses Chatraums"
+msgstr "%(owner_or_admin_or_member)s dieses Gruppenchats"
+
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Keine"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Mitglied"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Besitzer"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [blockiert]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [minimiert]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Verbunden"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+msgid "?Noun:Download"
+msgstr "Download"
+
+#: gajim/tooltips.py:653
+msgid "?Noun:Upload"
+msgstr "Upload"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Typ: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Pausiert"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Steht still"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "Verfügbar"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Abwesend"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Abgemeldet"
 
@@ -3166,121 +3226,122 @@ msgstr "(Keine)"
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr "Rechner geht in den Ruhezustand"
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr "Verbindung mit dem Netzwerk trennen"
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
-msgstr "Unterhaltungs-Verlauf mit %s"
+msgstr "Unterhaltungsverlauf mit %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Unterhaltungsverlauf"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Festplattenfehler"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ist jezt %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Fehler: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Fehler"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Der Status ist jetzt: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Der Status ist jetzt: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
-#: gajim/statusicon.py:233
-#, fuzzy
+#: gajim/statusicon.py:215
 msgid "_Change Status Message…"
-msgstr "Ändere _Statusnachricht"
+msgstr "Ändere _Statusnachricht…"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "über das Konto %s"
 
-#: gajim/statusicon.py:333
-#, fuzzy
+#: gajim/statusicon.py:315
 msgid "_Manage Bookmarks…"
-msgstr "Chatraum-Lesezeichen"
+msgstr "Gespeicherte Gruppenchats…"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "_Kontaktliste verstecken"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "_Kontaktliste anzeigen"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "Konnte Bild nicht laden"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Medientyp wird nicht unterstützt: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "Dieses Feld wird benötigt"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "neu@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "neu%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
-msgstr "%s Tage, %s Stunden"
+msgid "%(days)s days, %(hours)s hours"
+msgstr "%(days)s Tage, %(hours)s Stunden"
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
-#, fuzzy
 msgid "Hostname"
-msgstr "Rec_hnername:"
+msgstr "Hostname"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr "Serversoftware"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 msgid "Server Uptime"
 msgstr "Serverlaufzeit"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3306,7 +3367,7 @@ msgstr "Andere"
 
 #: gajim/disco.py:133
 msgid "Conference"
-msgstr "Konferenz"
+msgstr "Gruppenchat"
 
 #: gajim/disco.py:537
 msgid "Without a connection, you can not browse available services"
@@ -3354,11 +3415,11 @@ msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
 #: gajim/disco.py:896
 msgid "Browse"
-msgstr "_Durchsuchen"
+msgstr "Durchsuchen"
 
 #: gajim/disco.py:1092
 msgid "This service does not contain any items to browse."
-msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
+msgstr "Dieser Dienst enthält keine durchsuchbaren Objekte."
 
 #: gajim/disco.py:1304
 msgid "Execute Command"
@@ -3371,7 +3432,7 @@ msgstr "Re_gistrieren"
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
 #: gajim/data/gui/join_groupchat_window.ui:325
 msgid "Join"
-msgstr "_Beitreten"
+msgstr "Betreten"
 
 #: gajim/disco.py:1326 gajim/data/gui/search_window.ui:23
 msgid "Search"
@@ -3400,26 +3461,26 @@ msgstr "ID"
 
 #: gajim/disco.py:1748 gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
-msgstr "Chatraum zu den Lesezeichen _hinzufügen"
+msgstr "_Gruppenchat speichern"
 
 #: gajim/disco.py:1782
 msgid "Bookmark already set"
-msgstr "Chatraum ist bereits gespeichert"
+msgstr "Gruppenchat ist bereits gespeichert"
 
 #: gajim/disco.py:1783
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
+msgstr "Der Gruppenchat \"%s\" wurde bereits gespeichert."
 
 #: gajim/disco.py:1793
 msgid "Bookmark has been added successfully"
-msgstr "Chatraum wurde erfolgreich gespeichert"
+msgstr "Gruppenchat wurde erfolgreich gespeichert"
 
 #: gajim/disco.py:1794
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
-"Sie können die gespeicherten Chaträume über das Aktionen-Menü in der "
-"Kontaktliste bearbeiten"
+"Sie können die gespeicherten Gruppenchats über das Gajim-Menü in der "
+"Kontaktliste bearbeiten."
 
 #: gajim/disco.py:1986
 msgid "Subscribed"
@@ -3441,93 +3502,104 @@ msgstr "_Abonnieren"
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
-"Der Text unterhalb dieser Linie zeigt, was seit Ihrem \n"
-"letzten Besuch in diesem Chatraum gesagt wurde."
+"Der Text unterhalb dieser Linie zeigt, was seit Ihrem\n"
+"letzten Besuch in diesem Gruppenchat gesagt wurde."
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Zitieren"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
-msgstr "Im Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
+msgstr "In der Wörterbuch-URL fehlt ein \"%s\" und sie ist nicht WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In der URL für die Websuche fehlt ein \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
-msgstr "Im _Internet hiernach suchen"
+msgstr "Im _Internet suchen"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr "URL:"
 
-#: gajim/conversation_textview.py:1024
-#, fuzzy
+#: gajim/conversation_textview.py:1021
 msgid "Invalid URL"
 msgstr "Ungültige Jabber-ID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+"<b>Nachricht wurde korrigiert. Ursprüngliche Nachricht:</b>\n"
+"{}"
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
 msgstr[0] "Gestern"
-msgstr[1] "vor %(nb_days)i Tagen"
+msgstr[1] "Vor %(nb_days)i Tagen"
 
 #: gajim/message_textview.py:43
 msgid "Write a message.."
 msgstr "Eine Nachricht schreiben.."
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Sie sind dabei verschiedene Tabs zu schließen"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Möchten Sie wirklich alle schließen?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+msgid "?Noun:Chats"
+msgstr "Chats"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
-msgstr "Fehler beim Betreten des Chatraums"
+msgstr "Konnte dem Gruppenchat nicht beitreten"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3535,189 +3607,184 @@ msgid ""
 "is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Der gewünschte Benutzername für den Chatraum\n"
+"Der gewünschte Spitzname für den Gruppenchat\n"
 "<b>%s</b>\n"
-"ist in Benutzung oder wurde von einem anderen Benutzer registriert.\n"
-"Bitte geben Sie einen anderen Benutzernamen ein:"
+"wird bereits verwendet oder wurde von einem anderen Benutzer registriert.\n"
+"Bitte geben Sie einen anderen Spitznamen ein:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Benutze bei einem Konflikt immer diesen Spitznamen"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
-msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
+msgstr "Akzeptieren Sie diese Anfrage in dem Konto %s?"
 
-#: gajim/gui_interface.py:186
-#, fuzzy, python-format
+#: gajim/gui_interface.py:185
+#, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
-msgstr "HTTP (%(method)s) Autorisierung für %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s) Autorisierung für %(url)s (ID: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
-msgstr "Für das Betreten des Chatraumes %s wird ein Passwort benötigt."
+msgstr ""
+"Um dem Gruppenchat %s beizutreten wird ein Passwort benötigt. Bitte geben "
+"Sie das Passwort ein."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>%s</b> ist voll"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
-msgstr "Sie wurden aus dem Chatraum <b>%s</b> verbannt."
+msgstr "Sie wurden aus dem Gruppenchat <b>%s</b> verbannt."
 
-#: gajim/gui_interface.py:347
-#, fuzzy, python-format
+#: gajim/gui_interface.py:346
+#, python-format
 msgid "Remote server <b>%s</b> does not exist."
-msgstr "Der Chatraum <b>%s</b> existiert nicht."
+msgstr "Der Server <b>%s</b> existiert nicht."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
-msgstr "Der Chatraum <b>%s</b> existiert nicht."
+msgstr "Der Gruppenchat <b>%s</b> existiert nicht."
 
-#: gajim/gui_interface.py:354
-#, fuzzy
+#: gajim/gui_interface.py:353
 msgid "Group chat creation is not permitted."
-msgstr "Die Chatraumerstellung ist eingeschränkt."
+msgstr "Das Erstellen von Gruppenchats ist nicht erlaubt."
 
-#: gajim/gui_interface.py:356
-#, fuzzy
+#: gajim/gui_interface.py:355
 msgid "Unable to join groupchat"
-msgstr "Fehler beim Betreten des Chatraums"
+msgstr "Konnte dem Gruppenchat nicht beitreten"
 
-#: gajim/gui_interface.py:357
-#, fuzzy, python-format
+#: gajim/gui_interface.py:356
+#, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr ""
-"Sie müssen Ihren registrierten Spitznamen im Chatraum <b>%s</b> verwenden."
+"Sie müssen Ihren registrierten Spitznamen im Gruppenchat <b>%s</b> verwenden."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
-msgstr "Sie stehen nicht in der Mitgliedliste des Chatraums %s."
+msgstr "Sie stehen nicht in der Mitgliederliste des Gruppenchats %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fehler %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
-msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
+msgstr "Fehler beim Senden der %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Abonnementanfrage"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Beobachter"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" hat Sie autorisiert, seinen Status zu sehen."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: gajim/gui_interface.py:549
-#, fuzzy
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
-"Er wird Ihnen von nun an als offline angezeigt.\n"
+"Der Kontakt wird Ihnen von nun an als offline angezeigt.\n"
 "Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr ""
 "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s lehnte die Einladung ab: %(reason)s"
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s lehnte die Einladung ab"
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
-"Sie haben Gajim für die Verwendung des GPG-A\tgenten konfiguriert, es läuft "
-"jedoch kein GPG-Agent oder er gab eine falsche Passphrase zurück.\n"
+"Sie haben Gajim für die Verwendung des OpenPGP-Agent konfiguriert, aber es "
+"läuft kein OpenPGP-Agent oder er gab eine falsche Passphrase zurück.\n"
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
 
-#: gajim/gui_interface.py:681
-#, fuzzy
+#: gajim/gui_interface.py:680
 msgid "Wrong passphrase"
 msgstr "Falsche Passphrase"
 
-#: gajim/gui_interface.py:686
-#, fuzzy
+#: gajim/gui_interface.py:685
 msgid "Wrong OpenPGP passphrase"
-msgstr "Falsche Passphrase"
+msgstr "Falsche OpenPGP-Passphrase"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 msgid "Certificate Passphrase Required"
 msgstr "Zertifikats-Passphrase benötigt"
 
-# TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:701
-#, fuzzy, python-format
+#: gajim/gui_interface.py:700
+#, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Geben Sie die Passphrase für das Zertifikat des Kontos %s ein"
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:724
-#, fuzzy
+#: gajim/gui_interface.py:723
 msgid "Untrusted OpenPGP key"
-msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
+msgstr "Unvertrauenswürdiger OpenPGP-Schlüssel"
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
@@ -3725,7 +3792,7 @@ msgstr ""
 "Der GPG-Schlüssel zum Verschlüsseln dieses Chats ist nicht vertrauenswürdig. "
 "Möchten Sie diese Nachricht wirklich verschlüsseln?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
@@ -3733,105 +3800,107 @@ msgstr ""
 "Bitte kopieren sie den Sitzungsbezeichner (Token) von der Website die gerade "
 "geöffnet wurde und fügen ihn hier ein."
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr "Oauth2 Zugangsdaten"
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL-Zertifikat-Fehler"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 msgid "File Transfer Failed"
 msgstr "Dateiübertragung fehlgeschlagen"
 
-#: gajim/gui_interface.py:1061
-#, fuzzy, python-format
+#: gajim/gui_interface.py:1060
+#, python-format
 msgid "%(filename)s received from %(name)s."
-msgstr ""
-"Die Übertragung der Datei %(filename)s von %(name)s ist fehlgeschlagen."
+msgstr "%(filename)s wurde von %(name)s empfangen."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr ""
-"Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
+msgstr "Die Übertragung der Datei %(filename)s von %(name)s wurde gestoppt."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 "Die Übertragung der Datei %(filename)s von %(name)s ist fehlgeschlagen."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
+msgstr "Die Übertragung der Datei %(filename)s an %(name)s wurde gestoppt."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Die Übertragung von %(filename)s an %(name)s ist fehlgeschlagen."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+msgid "Choose file to send"
+msgstr "Dateien zum Senden auswählen"
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Die Nachricht konnte nicht entschlüsselt werden"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
-msgstr "Ressourcenkonflikt"
+msgstr "Konflikt mit der XMPP-Ressource"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
-"Sie sind mit diesem Konto bereits mit derselben Ressource verbunden. Bitte "
-"geben Sie eine neue Ressource ein"
+"Sie sind mit diesem Konto bereits mit derselben XMPP-Ressource verbunden. "
+"Bitte geben Sie eine neue XMPP-Ressource ein"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s möchte einen Sprachchat beginnen."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Anfrage für Sprachchat"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: gajim/gui_interface.py:1343
-#, fuzzy, python-format
+#: gajim/gui_interface.py:1384
+#, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
 "%(error)s\n"
 "Do you still want to connect to this server?"
 msgstr ""
-"Es trat ein Fehler bei der Überprüfung des SSL-Zertifikats Ihres Jabber-"
+"Es trat ein Fehler bei der Überprüfung des SSL-Zertifikats Ihres XMPP-"
 "Servers auf: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3841,23 +3910,21 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 "Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n"
-"SHA1-Fingerprint des Zertifikates:\n"
+"SHA1-Fingerabdruck des Zertifikates:\n"
 "%(sha1)s\n"
-"SHA256-Fingerprint des Zertifikates:\n"
+"SHA256-Fingerabdruck des Zertifikates:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr "Nicht-anonymer Server"
 
-# FIXME: Check English. Should be:
-# your connection has been hacked.
-#: gajim/gui_interface.py:1390
-#, fuzzy, python-format
+#: gajim/gui_interface.py:1431
+#, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
 "valid or your connection is being compromised.\n"
@@ -3872,25 +3939,26 @@ msgid ""
 msgstr ""
 "Das SSL-Zertifikat für das Konto %(account)s hat sich geändert und ist "
 "ungültig oder die Verbindung wird angegriffen.\n"
-"Alter SHA-1-Fingerprint: %(old_sha1)s\n"
-"Alter SHA-256-Fingerprint: %(old_sha256)s\n"
 "\n"
-"Neuer SHA-1-Fingerprint: %(new_sha1)s\n"
-"Neuer SHA-256-Fingerprint: %(new_sha256)s\n"
+"Alter SHA-1-Fingerabdruck: %(old_sha1)s\n"
+"Alter SHA-256-Fingerabdruck: %(old_sha256)s\n"
+"\n"
+"Neuer SHA-1-Fingerabdruck: %(new_sha1)s\n"
+"Neuer SHA-256-Fingerabdruck: %(new_sha256)s\n"
 "\n"
 "Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats "
 "aktualisieren?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 "Sie sind dabei, Ihr Passwort über eine unsichere Verbindung zu senden. Sind "
-"Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
-"installieren, um dieses Problem zu beheben.)"
+"Sie sicher, dass Sie dies tun möchten? Es ist ratsam, PyOpenSSL zu "
+"installieren, um dieses Problem zu beheben."
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3898,63 +3966,61 @@ msgstr ""
 "Sie sind dabei, Ihr Passwort unverschlüsselt über eine unsichere Verbindung "
 "zu übertragen. Sind Sie sicher, dass Sie dies tun möchten?"
 
-#: gajim/gui_interface.py:1807
-#, fuzzy
+#: gajim/gui_interface.py:1848
 msgid "JID is not a Groupchat"
-msgstr "Dies ist kein Chatraum"
+msgstr "Die Jabber-ID ist kein Gruppenchat"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Emoticons deaktiviert"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
-"Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
-"deaktiviert."
+"Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons wurden "
+"deshalb deaktiviert."
 
-#: gajim/gui_interface.py:1973
-#, fuzzy
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
-"Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
-"deaktiviert."
+"Das konfigurierte Emoticon-Set konnte nicht geladen werden. Weitere "
+"Informationen finden sich im Log."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
-msgstr "Dies ist kein Chatraum"
+msgstr "Dies ist kein Gruppenchat"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
 "correct group chat name. If it is, delete it from your roster and try "
 "joining the group chat again."
 msgstr ""
-"%(room_jid)s ist bereits auf Ihrer Kontaktliste. Bitte prüfen Sie ob "
+"%(room_jid)s ist bereits in Ihrer Kontaktliste. Bitte prüfen Sie, ob "
 "%(room_jid)s ein gültiger Gruppenchatname ist. Falls ja, löschen Sie ihn von "
 "Ihrer Kontaktliste und versuchen Sie erneut beizutreten."
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "Standard"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
@@ -3962,13 +4028,13 @@ msgstr ""
 "%(account)s)."
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 msgid "OpenPGP key expired"
 msgstr "GPG-Schlüssel abgelaufen"
 
 # TODO: GPG/PGP unification in original strings needed
 # FIXME: should be "has expired"
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
@@ -3976,12 +4042,12 @@ msgstr ""
 "Ihr GPG-Schlüssel ist abgelaufen. Sie werden ohne OpenPGP-Verschlüsselung "
 "mit %s verbunden."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
@@ -4034,7 +4100,7 @@ msgstr "Der Dienst sendete unzureichende Daten."
 
 #: gajim/adhoc_commands.py:396
 msgid "Service changed the session identifier."
-msgstr "Der Dienst änderte die Sitzungskennung."
+msgstr "Der Dienst hat die Sitzungskennung geändert."
 
 #: gajim/adhoc_commands.py:416
 #, python-format
@@ -4047,16 +4113,21 @@ msgstr "Der Dienst gab einen Fehler zurück."
 
 #: gajim/negotiation.py:34
 msgid "- messages will be logged"
-msgstr "- Nachrichten werden aufgezeichnet"
+msgstr "- der Unterhaltungsverlauf wird gespeichert"
 
 #: gajim/negotiation.py:36
 msgid "- messages will not be logged"
-msgstr "- Nachrichten werden nicht aufgezeichnet"
+msgstr "- der Unterhaltungsverlauf wird nicht gespeichert"
+
+#: gajim/notify.py:103
+msgid "Open"
+msgstr "Öffnen"
 
 #: gajim/dialog_messages.py:33
-#, fuzzy
 msgid "You can not start a new conversation unless you are connected."
-msgstr "Sie können einen Chatraum erst betreten, wenn Sie verbunden sind."
+msgstr ""
+"Sie können keine neue Unterhaltung beginnen, solange Sie nicht verbunden "
+"sind."
 
 #: gajim/dialog_messages.py:48
 msgid "Unread events"
@@ -4082,7 +4153,7 @@ msgstr "Ungültiges Formular"
 msgid "The form is not filled correctly."
 msgstr "Das Formular wurde nicht korrekt ausgefüllt."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -4095,12 +4166,10 @@ msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
 #: gajim/dialog_messages.py:73
-#, fuzzy
 msgid "JID already in list"
-msgstr "Die Jabber-ID steht bereits in der Liste"
+msgstr "Die Jabber-ID ist bereits in der Liste"
 
 #: gajim/dialog_messages.py:74
-#, fuzzy
 msgid "The JID you entered is already in the list. Choose another one."
 msgstr ""
 "Die eingegebene Jabber-ID ist bereits in der Liste. Wählen Sie bitte eine "
@@ -4119,7 +4188,7 @@ msgstr ""
 
 #: gajim/dialog_messages.py:84
 msgid "Wrong Custom Hostname"
-msgstr "Falscher benutzerdefinierter Rechnername"
+msgstr "Falscher benutzerdefinierter Hostname"
 
 #: gajim/dialog_messages.py:85
 #, python-format
@@ -4186,9 +4255,8 @@ msgstr ""
 "%(error_msg)s"
 
 #: gajim/dialog_messages.py:117
-#, fuzzy
 msgid "Unable to join Groupchat"
-msgstr "Fehler beim Betreten des Chatraums"
+msgstr "Konnte dem Gruppenchat nicht beitreten"
 
 #: gajim/dialog_messages.py:122
 msgid "GStreamer error"
@@ -4207,10 +4275,9 @@ msgstr ""
 msgid "Wrong host"
 msgstr "Falscher Server"
 
-# TODO: Review by german translators. Get closer to original string and write instead: Ungültige lokale Adresse? :-O
 #: gajim/dialog_messages.py:128
 msgid "Invalid local address? :-O"
-msgstr "Ungültige Lokale Adresse!"
+msgstr "Ungültige lokale Adresse? :-O"
 
 #: gajim/dialog_messages.py:132
 msgid "Avahi error"
@@ -4225,6 +4292,53 @@ msgstr ""
 "%s\n"
 "Lokaler Nachrichtenversand funktioniert eventuell nicht richtig."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+msgid "Could not request upload slot"
+msgstr "Konnte keinen Upload Slot anfordern"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr "Unerwartete Antwort vom Server bekommen (siehe Log)"
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+msgid "Could not open file"
+msgstr "Datei konnte nicht geöffnet werden"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr "Fehler beim Öffnen der Datei (siehe Log)"
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr "Unsicher"
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+"Der Server schlägt einen ungesicherten Transportweg ohne "
+"Transportverschlüsselung vor (http)"
+
+#: gajim/dialog_messages.py:162
+msgid "Could not upload file"
+msgstr "Datei konnte nicht hochgeladen werden"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr "HTTP Antwort-Code des Servers: %s"
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr "Fehler beim Hochladen"
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr "Verschlüsselungsfehler"
+
+#: gajim/dialog_messages.py:173
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Die gewählte Verschlüsselungsmethode ist nicht verfügbar"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Design"
@@ -4234,9 +4348,8 @@ msgid "You cannot make changes to the default theme"
 msgstr "Sie können das derzeitige Design nicht ändern"
 
 #: gajim/gajim_themes_window.py:99
-#, fuzzy
 msgid "Please create a new clean theme."
-msgstr "Bitte erstellen Sie ein neues leeres Design mit dem gewünschten Namen."
+msgstr "Bitte erstellen Sie ein neues leeres Design."
 
 #: gajim/gajim_themes_window.py:170
 msgid "theme name"
@@ -4250,7 +4363,15 @@ msgstr "Sie können Ihr derzeitiges Design nicht löschen"
 msgid "Pick another theme to use first."
 msgstr "Wählen sie zunächst ein anderes Theme."
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+msgid "Merge Accounts"
+msgstr "Konten zusammenführen"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr "PGP Agent verwenden"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
@@ -4271,12 +4392,16 @@ msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
 
 #: gajim/accounts_window.py:212
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
+msgstr ""
+"Alle Chatfenster und Gruppenchats werden geschlossen. Wollen Sie fortfahren?"
+
+#: gajim/accounts_window.py:344
+msgid "Remove"
+msgstr "Entfernen"
 
 #: gajim/accounts_window.py:387
-#, fuzzy
 msgid "Rename account label"
-msgstr "Konto umbenennen"
+msgstr "Bezeichnung des Kontos ändern"
 
 #: gajim/accounts_window.py:456
 msgid "Login"
@@ -4287,43 +4412,36 @@ msgid "Connection"
 msgstr "Verbindung"
 
 #: gajim/accounts_window.py:468
-#, fuzzy
 msgid "Import Contacts"
-msgstr "_Kontakte einladen"
+msgstr "Kontakte einladen"
 
 #: gajim/accounts_window.py:471 gajim/accounts_window.py:654
-#, fuzzy
 msgid "Client Certificate"
-msgstr "Clientzertifikat"
+msgstr "Client-Zertifikat"
 
 #: gajim/accounts_window.py:474 gajim/accounts_window.py:569
-#, fuzzy
 msgid "OpenPGP Key"
-msgstr "OpenPGP: "
+msgstr "OpenPGP Schlüssel"
 
 #: gajim/accounts_window.py:485 gajim/accounts_window.py:557
-#, fuzzy
 msgid "Connect on startup"
-msgstr "Beim Pr_ogrammstart verbinden"
+msgstr "Beim Programmstart verbinden"
 
 #: gajim/accounts_window.py:488
-#, fuzzy
 msgid "Reconnect when connection is lost"
-msgstr "Automatisch neu verbinden, falls die Verbindung abbricht"
+msgstr "Automatisch neu verbinden, wenn die Verbindung unterbrochen wird"
 
 #: gajim/accounts_window.py:491 gajim/accounts_window.py:561
-#, fuzzy
 msgid "Save conversations for all contacts"
-msgstr "Unterhaltungsver_lauf für alle Kontakte dieses Kontos speichern"
+msgstr "Unterhaltungsverlauf für alle Kontakte dieses Kontos speichern"
 
 #: gajim/accounts_window.py:493 gajim/accounts_window.py:563
 msgid "Store conversations on the harddrive"
 msgstr "Speichere Unterhaltungen auf der Festplatte"
 
 #: gajim/accounts_window.py:495
-#, fuzzy
 msgid "Server Message Archive"
-msgstr "Servernachricht _senden …"
+msgstr "Serverseitiges Nachrichtenarchiv"
 
 #: gajim/accounts_window.py:497
 msgid ""
@@ -4338,19 +4456,16 @@ msgstr ""
 "XEP-0313"
 
 #: gajim/accounts_window.py:502 gajim/accounts_window.py:565
-#, fuzzy
 msgid "Global Status"
-msgstr "Alle Status"
+msgstr "Globaler Status"
 
 #: gajim/accounts_window.py:504
-#, fuzzy
 msgid "Synchronise the status of all accounts"
-msgstr "Ändert den Status eines oder mehrerer Konten"
+msgstr "Synchronisiert den Status aller Konten"
 
 #: gajim/accounts_window.py:506
-#, fuzzy
 msgid "Message Carbons"
-msgstr "Nachrichten"
+msgstr "Nachrichtenkopien"
 
 #: gajim/accounts_window.py:508
 msgid ""
@@ -4364,22 +4479,19 @@ msgstr ""
 
 #: gajim/accounts_window.py:512
 msgid "Use file transfer proxies"
-msgstr "Dateiübertragungs-Proxys verwenden"
+msgstr "Proxies für Dateiübertragungen verwenden"
 
 #: gajim/accounts_window.py:524 gajim/accounts_window.py:559
-#, fuzzy
 msgid "Use environment variable"
-msgstr "Umgebungsvariable HTTP__PROXY ben_utzen"
+msgstr "Umgebungsvariable benutzen"
 
 #: gajim/accounts_window.py:526
-#, fuzzy
 msgid "Proxy"
-msgstr "Proxy:"
+msgstr "Proxy"
 
 #: gajim/accounts_window.py:529
-#, fuzzy
 msgid "Warn on insecure connection"
-msgstr "_Warnen, bevor eine unsichere Verbindung verwendet wird"
+msgstr "Warnen, bevor eine unsichere Verbindung verwendet wird"
 
 #: gajim/accounts_window.py:533
 msgid "Send keep-alive packets"
@@ -4390,77 +4502,64 @@ msgid "Manually set the hostname for the server"
 msgstr "Den Hostnamen für den Server manuell festlegen"
 
 #: gajim/accounts_window.py:540
-#, fuzzy
 msgid "Resource"
-msgstr "Ressource:"
+msgstr "XMPP-Ressource"
 
 #: gajim/accounts_window.py:543 gajim/accounts_window.py:611
 #: gajim/accounts_window.py:616
-#, fuzzy
 msgid "Priority"
-msgstr "Priori_tät:"
+msgstr "Priorität"
 
 #: gajim/accounts_window.py:567
-#, fuzzy
 msgid "Synchronize the status of all accounts"
-msgstr "Ändert den Status eines oder mehrerer Konten"
+msgstr "Synchronisier den Status aller Konten"
 
 #: gajim/accounts_window.py:580
-#, fuzzy
 msgid "First Name"
-msgstr "Vorname:"
+msgstr "Vorname"
 
 #: gajim/accounts_window.py:583
-#, fuzzy
 msgid "Last Name"
-msgstr "Nachname:"
+msgstr "Nachname"
 
 #: gajim/accounts_window.py:586
 #: gajim/data/gui/archiving_313_preferences_window.ui:71
 msgid "Jabber ID"
-msgstr "Jabber ID"
+msgstr "Jabber-ID"
 
 #: gajim/accounts_window.py:589
-#, fuzzy
 msgid "Email"
-msgstr "Neue E-Mail"
+msgstr "E-Mail"
 
 #: gajim/accounts_window.py:607
-#, fuzzy
 msgid "Adjust to status"
-msgstr "Mit Status _abgleichen"
+msgstr "Mit Status abgleichen"
 
 #: gajim/accounts_window.py:634
 msgid "Enable"
 msgstr "Aktivieren"
 
 #: gajim/accounts_window.py:641
-#, fuzzy
 msgid "Port"
-msgstr "_Port:"
+msgstr "_Port"
 
 #: gajim/accounts_window.py:646
-#, fuzzy
 msgid "Connection Options"
-msgstr "Verbindung"
+msgstr "Verbindungsoptionen"
 
 #: gajim/accounts_window.py:658
-#, fuzzy
 msgid "Encrypted Certificate"
-msgstr "Clientzertifikat"
+msgstr "Verschlüsseltes Zertifikat"
 
 #: gajim/accounts_window.py:662
-#, fuzzy
 msgid "Certificate Options"
-msgstr "Benachrichtigungen"
+msgstr "Zertifikatsoptionen"
 
 #: gajim/accounts_window.py:670 gajim/data/gui/join_groupchat_window.ui:143
-#, fuzzy
 msgid "Password"
-msgstr "Passwort:"
+msgstr "Passwort"
 
 #: gajim/accounts_window.py:674
-#, fuzzy
 msgid "Save Password"
 msgstr "Passwort speichern"
 
@@ -4469,55 +4568,65 @@ msgid "Change Password"
 msgstr "Passwort ändern"
 
 #: gajim/accounts_window.py:682
-#, fuzzy
 msgid "Login Options"
-msgstr "Optionen:"
+msgstr "Optionen"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "D-Bus ist auf diesem Computer nicht vorhanden oder das Python-Modul fehlt."
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Zeigt die Hilfe für einen bestimmten Befehl"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "Befehl"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: gajim/gajim_remote.py:96
-#, fuzzy
+#: gajim/gajim_remote.py:97
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
-"Gibt eine Liste aller Kontakte in der Kontaktliste aus. Eine Zeile je Kontakt"
+"Gibt eine Liste aller in der Kontaktliste enthaltenen Kontakte aus und "
+"verwendet dabei eine Zeile je Kontakt"
+
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+msgid "?CLI:account"
+msgstr "Konto"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: gajim/gajim_remote.py:108
-#, fuzzy
+#: gajim/gajim_remote.py:109
 msgid "Changes the status of account(s)"
 msgstr "Ändert den Status eines oder mehrerer Konten"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+msgid "?CLI:status"
+msgstr "Status"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4525,11 +4634,16 @@ msgstr ""
 "Ein Wert von: offline, online, chat, away, xa, dnd, invisible. Wenn nicht "
 "definiert, wird der letzte Kontostatus verwendet"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+msgid "?CLI:message"
+msgstr "Nachricht"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4538,16 +4652,19 @@ msgstr ""
 "aller Konten für die die Option \"Kontostatus mit globalem Status "
 "synchronisieren\" aktiviert ist"
 
-#: gajim/gajim_remote.py:119
-#, fuzzy
+#: gajim/gajim_remote.py:120
 msgid "Changes the priority of account(s)"
 msgstr "Ändert die Priorität eines oder mehrerer Konten"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+msgid "?CLI:priority"
+msgstr "Priorität"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "Priorität, die Sie dem Konto geben möchten"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4556,7 +4673,7 @@ msgstr ""
 "aller Konten für die die Option \"Kontostatus mit globalem Status "
 "synchronisieren\" aktiviert ist"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4564,159 +4681,159 @@ msgid ""
 msgstr ""
 "Sendet eine Nachricht an einen Kontakt in der Kontaktliste. OpenPGP-"
 "Schlüssel und Konto sind optional. Falls nur das Konto ohne einen OpenGPG-"
-"Schlüssel gesetzt werden soll, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
+"Schlüssel gesetzt werden soll, setzen Sie \"OpenGPG-Schlüssel\" einfach auf "
+"\"\"."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "Jabber-ID des Kontakts, der die Nachricht empfangen soll"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr "PGP-Schlüssel"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "falls angegeben, wird die Nachricht damit verschlüsselt"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: gajim/gajim_remote.py:142
-#, fuzzy
+#: gajim/gajim_remote.py:143
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
 "and account. If you want to only set the latter, set OpenPGP key to \"\"."
 msgstr ""
 "Sendet eine Nachricht an einen Kontakt in der Kontaktliste. OpenPGP-"
 "Schlüssel und Konto sind optional. Falls nur das Konto ohne einen OpenGPG-"
-"Schlüssel gesetzt werden soll, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
+"Schlüssel gesetzt werden soll, setzen Sie \"OpenGPG-Schlüssel\" einfach auf "
+"\"\"."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "Betreff"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
-msgstr "Sendet eine neue Nachricht an einen Chatraum, den Sie betreten haben."
+msgstr ""
+"Sendet eine neue Nachricht an einen Gruppenchat, dem Sie beigetreten sind."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
-msgstr "Jabber-ID des Chatraums, der die Nachricht empfangen soll"
+msgstr "Jabber-ID des Gruppenchats, der die Nachricht empfangen soll"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über einen Kontakt"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "Jabber-ID des Kontakts"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "Datei"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Dateipfad"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Wenn angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Zeigt alle Einstellungen und ihre Werte"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setzt den Wert von 'Schlüssel' auf 'Wert'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: gajim/gajim_remote.py:192
-#, fuzzy
+#: gajim/gajim_remote.py:193
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
-"'Schlüssel' ist der Name der Einstellung, 'Wert' ist der der einzustellende "
+"\"Schlüssel\" ist der Name der Einstellung, \"Wert\" ist der einzustellende "
 "Wert"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Löscht eine Einstellung"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "Schlüssel"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Schreibt die aktuellen Gajim-Einstellungen in die Konfigurationsdatei"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus der Kontaktliste"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "falls angegeben, wird der Kontakt von der Liste dieses Kontos gewählt"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Gibt den derzeitigen Status zurück (den globalen Status, es sei denn, es "
 "wird ein Konto angegeben)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Gibt die derzeitige Statusnachricht zurück (die globale, es sei denn, es "
 "wird ein Konto angegeben)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Benutzerdefinierten XML-Code senden"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
-#: gajim/gajim_remote.py:240
-#, fuzzy
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4724,15 +4841,15 @@ msgstr ""
 "Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
 "der XML-Code an alle Konten gesendet"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Avatar ändern"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Bild, das benutzt werden soll"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4740,19 +4857,19 @@ msgstr ""
 "Konto, für das der Avatar definiert wird; falls nicht angegeben, wird der "
 "Avatar allen Konten zugewiesen"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
-msgstr "Fehlendes Argument \"contact_Jabber-ID\""
+msgstr "Fehlendes Argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4761,17 +4878,17 @@ msgstr ""
 "'%s' ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Gajim scheint nicht gestartet zu sein, daher kann gajim-remote nicht genutzt "
 "werden."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4780,16 +4897,16 @@ msgstr ""
 "Verwendung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4798,21 +4915,21 @@ msgid ""
 "Command is one of:\n"
 msgstr ""
 "Verwendung:\n"
-" %s Befehl [Argumente]\n"
+"  %s Befehl [Argumente]\n"
 "\n"
 "Der Befehl ist einer von:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
-"Zu viele Argumente.\n"
+"Zu viele Argumente. \n"
 "Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4987,20 +5104,15 @@ msgstr "Ende der Woche"
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: gajim/common/passwords.py:84
-#, python-format
-msgid "XMPP account %s"
-msgstr "XMPP-Konto %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 msgstr ""
-"Die Jabber-ID %s ist nicht RFC-konform und wird nicht zu Ihrer Kontaktliste "
-"hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool wie <http://jru."
-"jabberstudio.org/>, um sie zu entfernen."
+"Die Jabber-ID %s ist nicht RFC-konform. Sie wird nicht zu Ihrer Kontaktliste "
+"hinzugefügt. Verwenden Sie ein Kontaktlistenverwaltungswerkzeug wie http://"
+"jru.jabberstudio.org/, um sie zu entfernen."
 
 #: gajim/common/connection_handlers_events.py:877
 #, python-format
@@ -5009,59 +5121,59 @@ msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
 #: gajim/common/connection_handlers_events.py:977
 msgid "Room has been destroyed"
-msgstr "Der Chatraum wurde gelöscht"
+msgstr "Der Gruppenchat wurde aufgelöst"
 
 #: gajim/common/connection_handlers_events.py:985
 #, python-format
 msgid "You can join this room instead: %s"
-msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
+msgstr "Sie können stattdessen diesem Gruppenchat beitreten: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Einzelne neue Nachricht von %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
-msgstr "Neue private Nachricht aus dem Chatraum %s"
+msgstr "Neue private Nachricht aus dem Gruppenchat %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s änderte seinen Status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Nicht in der Kontaktliste"
 
@@ -5085,7 +5197,7 @@ msgstr ""
 
 #: gajim/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
-msgstr "Zeit in Minuten, nach der Ihr Status auf Abwesend gesetzt wird"
+msgstr "Zeit in Minuten, nach der Ihr Status auf Abwesend gesetzt wird."
 
 #: gajim/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
@@ -5152,13 +5264,12 @@ msgid "Contact signout notification color"
 msgstr "Farbe für Abmeldungsbenachrichtigungen"
 
 #: gajim/common/config.py:104
-#, fuzzy
 msgid "New message notification color."
-msgstr "Benachrichtigungsfarbe für neue Nachrichten/Mails."
+msgstr "Benachrichtigungsfarbe für neue Nachrichten."
 
 #: gajim/common/config.py:105
 msgid "File transfer request notification color."
-msgstr "Benachrichtigungsfrage für Dateiübertragung."
+msgstr "Benachrichtigungsfarbe für Dateiübertragungsanfragen."
 
 #: gajim/common/config.py:106
 msgid "File transfer error notification color."
@@ -5167,7 +5278,7 @@ msgstr "Benachrichtigungsfarbe für Dateiübertragungsfehler."
 #: gajim/common/config.py:107
 msgid "File transfer complete or stopped notification color."
 msgstr ""
-"Benachrichtigungsfarbe für vollständige oder gestoppte Dateiübertragung."
+"Benachrichtigungsfarbe für vollständige oder gestoppte Dateiübertragungen."
 
 #: gajim/common/config.py:108
 msgid "Groupchat invitation notification color"
@@ -5199,7 +5310,7 @@ msgstr "Schriftart des abgehenden Textes."
 
 #: gajim/common/config.py:115
 msgid "Status message text font."
-msgstr "Schriftart der Statusnachricht"
+msgstr "Schriftart der Statusnachricht."
 
 #: gajim/common/config.py:116
 msgid ""
@@ -5234,9 +5345,8 @@ msgstr ""
 "'sometimes' gesetzt ist."
 
 #: gajim/common/config.py:127
-#, fuzzy
 msgid "Enable ASCII emoticons"
-msgstr "Ein Symbol auswählen"
+msgstr "ASCII Emoticons aktivieren"
 
 #: gajim/common/config.py:129
 msgid "Treat * / _ pairs as possible formatting characters."
@@ -5265,16 +5375,16 @@ msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"Zeichen, das hinter Spitznamen angezeigt wird, wenn die "
-"Spitznamenvervollständigung (Tab) in Chaträumen verwendet wird."
+"Nach einem Spitznamen anzufügendes Zeichen, wenn Spitznamen-"
+"Vervollständigung (Tablator) in einem Gruppenchat verwendet wird."
 
 #: gajim/common/config.py:143
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
-"Zeichen, das an den gewünschten Spitznamen gehängt wird, falls der dieser im "
-"Chatraum bereits vergeben ist."
+"Zeichen, das dem gewünschten Spitznamen angehängt wird, falls dieser im "
+"Gruppenchat bereits vergeben ist."
 
 #: gajim/common/config.py:165
 msgid ""
@@ -5310,37 +5420,35 @@ msgstr "Zeichen, die nach dem Spitznamen gedruckt werden"
 
 #: gajim/common/config.py:181
 msgid "Add * and [n] in roster title?"
-msgstr "Sollen * und [n] in den Titel der Kontaktleiste eingefügt werden?"
+msgstr "Sollen * und [n] in den Titel der Kontaktliste eingefügt werden?"
 
 #: gajim/common/config.py:182
-#, fuzzy
 msgid ""
 "How many history messages should be restored when a chat tab/window is "
 "reopened?"
 msgstr ""
-"Wie viele Zeilen von der vorherigen Unterhaltung angezeigt werden, wenn ein "
-"Tab/Fenster wieder geöffnet wird?"
+"Wie viele Nachrichten der vorherigen Unterhaltung sollen angezeigt werden, "
+"wenn ein Tab/Fenster erneut geöffnet wird?"
 
 #: gajim/common/config.py:183
 msgid "How far back in time (minutes) history is restored. -1 means no limit."
 msgstr ""
-"Wie weit zurück der Verlauf wiederhergestellt ist (Minuten). -1 bedeutet "
-"kein Limit."
+"Wie weit zurück in der Zeit (in Minuten) der Unterhaltungsverlauf "
+"wiederhergestellt werden soll. -1 bedeutet kein Limit."
 
 #: gajim/common/config.py:184
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
 msgstr ""
-"Wie viele alte Chatzeilen sollen beim Betreten eines Gruppenchats abgefragt "
-"werden? -1 bedeutet kein Limit"
+"Wie viele der letzten Nachrichten sollen beim Betreten eines Gruppenchats "
+"abgefragt werden? -1 bedeutet kein Limit"
 
 #: gajim/common/config.py:185
-#, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit"
 msgstr ""
-"Wie viele Minuten zurück sollen Chatzeilen beim Betreten eines Gruppenchats "
+"Wie viele Minuten zurück sollen Nachrichten beim Betreten eines Gruppenchats "
 "abgefragt werden? -1 bedeutet kein Limit"
 
 #: gajim/common/config.py:186
@@ -5348,15 +5456,15 @@ msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
-"Wie viele Sekunden soll gewartet werden, bevor ein Gruppenchat wieder "
-"automatisch betreten wird, von dem Sie getrennt worden sind? Setze den Wert "
-"auf 0, um das automatische Betreten zu deaktivieren."
+"Wie viele Sekunden soll gewartet werden, bevor einem Gruppenchat automatisch "
+"erneut beigetreten wird, von dem Sie getrennt worden sind? Setzen Sie den "
+"Wert auf 0, um das automatische Beitreten zu deaktivieren."
 
 #: gajim/common/config.py:187
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr ""
-"Soll das automatische Wiederbetreten aktiviert werden, wenn wir von einem "
+"Soll das automatische Wiederbeitreten aktiviert werden, wenn wir von einem "
 "Gruppenchat getrennt wurden?"
 
 #: gajim/common/config.py:188
@@ -5377,9 +5485,9 @@ msgid ""
 "Either custom url with %%s in it where %%s is the word/phrase or "
 "'WIKTIONARY' which means use wiktionary."
 msgstr ""
-"Entweder eine spezielle URL mit %%s, wobei %%s das Wort / die Phrase ist "
-"oder 'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary verwendet "
-"wird."
+"Entweder eine benutzerdefinierte URL mit %%s, wobei %%s das Wort oder der "
+"Satz ist, oder 'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary "
+"verwendet wird."
 
 #: gajim/common/config.py:196
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
@@ -5412,33 +5520,34 @@ msgstr ""
 
 #: gajim/common/config.py:201
 msgid "Ask before closing a group chat tab/window."
-msgstr "Fragen, bevor ein Chatraum-Tab oder -Fenster geschlossen wird."
+msgstr "Fragen, bevor ein Gruppenchat-Tab oder -Fenster geschlossen wird."
 
 #: gajim/common/config.py:202
-#, fuzzy
 msgid ""
 "Always ask for confirmation before closing groupchats with any of the JIDs "
 "on this space separated list."
 msgstr ""
-"Immer fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
-"Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
+"Immer fragen, bevor ein Gruppenchat-Tab oder -Fenster aus dieser Liste von "
+"Gruppchat-Jabber-IDs geschlossen wird (Jabber-IDs getrennt durch "
+"Leerzeichen)."
 
 #: gajim/common/config.py:203
-#, fuzzy
 msgid ""
 "Never ask for confirmation before closing groupchats with any of the JIDs on "
 "this space separated list."
 msgstr ""
-"Niemals fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
-"Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
+"Niemals fragen, bevor ein Gruppenchat-Tab oder -Fenster aus dieser Liste von "
+"Gruppchat-Jabber-IDs geschlossen wird (Jabber-IDs getrennt durch "
+"Leerzeichen)."
 
 #: gajim/common/config.py:204
 msgid ""
 "Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
-"Frage bevor ein Chatfenster mit mehreren Tabs geschlossen wird, wenn dadurch "
-"Daten verloren gehen würden (Chat, Privatchat, nicht minimierter Gruppenchat)"
+"Frage, bevor ein Chatfenster mit mehreren Tabs geschlossen wird, wenn "
+"dadurch Daten verloren gehen würden (Chat, Privatchat, nicht minimierter "
+"Gruppenchat)"
 
 #: gajim/common/config.py:207
 msgid ""
@@ -5446,7 +5555,7 @@ msgid ""
 "for File Transfer in case of address translation/port forwarding."
 msgstr ""
 "Kommagetrennte Liste von vollständigen Hostnamen oder IP-Adressen, die bei "
-"Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Rechnernamen "
+"Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Hostnamen "
 "gesendet werden."
 
 #: gajim/common/config.py:209
@@ -5467,7 +5576,7 @@ msgstr ""
 
 #: gajim/common/config.py:218
 msgid "Show tab when only one conversation?"
-msgstr "Tableiste bei nur einer Unterhaltung anzeigen?"
+msgstr "Tab-Leiste bei einzelner Unterhaltung anzeigen?"
 
 #: gajim/common/config.py:219
 msgid "Show tabbed notebook border in chat windows?"
@@ -5498,7 +5607,7 @@ msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung anzeigen?"
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
-"Eine durch Semikola getrennte Liste von Worten, die in einem Chatraum "
+"Eine durch Semikola getrennte Liste von Worten, die in einem Gruppenchat "
 "hervorgehoben werden sollen."
 
 #: gajim/common/config.py:238
@@ -5506,8 +5615,8 @@ msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if notification icon is used."
 msgstr ""
-"Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers "
-"geklickt wird. Diese Option funktioniert nur, wenn das "
+"Falls aktiviert, wird Gajim beendet, wenn die X-Schaltfläche des "
+"Fenstermanagers geklickt wird. Diese Option funktioniert nur, wenn das "
 "Benachrichtigungssymbol verwendet wird."
 
 #: gajim/common/config.py:239
@@ -5515,8 +5624,8 @@ msgid ""
 "If True, Gajim hides the Roster window on pressing the X button instead of "
 "minimizing into the Dock."
 msgstr ""
-"Falls aktiviert, versteckt Gajim die Kontaktliste beim Klick auf den X-"
-"Button anstatt sie in den Benachrichtigungsbereich zu minimieren."
+"Falls aktiviert, versteckt Gajim die Kontaktliste beim Klick auf die X-"
+"Schaltfläche anstatt sie in den Benachrichtigungsbereich zu minimieren."
 
 #: gajim/common/config.py:240
 msgid ""
@@ -5557,14 +5666,14 @@ msgid ""
 "group chat."
 msgstr ""
 "Kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", werden "
-"keine Status-Zeilen mehr in Chaträumen angezeigt, wenn jemand seinen Status "
-"oder seine Statusnachricht ändert. Falls \"all\", werden alle "
+"keine Status-Zeilen mehr in Gruppenchats angezeigt, wenn jemand seinen "
+"Status oder seine Statusnachricht ändert. Falls \"all\", werden alle "
 "Statusnachrichten anzeigt. Falls \"in_and_out\", wird nur dann ein Status "
-"angezeigt, wenn jemand den Chatraum betritt oder verlässt."
+"angezeigt, wenn jemand dem Gruppenchat beitritt oder ihn verlässt."
 
 #: gajim/common/config.py:251
 msgid "Log XHTML messages instead of plain text messages."
-msgstr "XHTML-Nachrichten anstelle von Text speichern."
+msgstr "XHTML-Nachrichten anstelle von reinen Textnachrichten speichern."
 
 #: gajim/common/config.py:252
 msgid "Background color of contacts when they just signed in."
@@ -5606,7 +5715,7 @@ msgid ""
 "presences."
 msgstr ""
 "Jabberd1.4 verarbeitet keine SHA-Informationen, wenn ein passwortgeschützter "
-"Chatraum betreten wird. Falls aktiviert, werden in Chaträumen keine SHA-"
+"Gruppenchat betreten wird. Falls aktiviert, werden in Gruppenchats keine SHA-"
 "Informationen gesendet."
 
 #: gajim/common/config.py:263
@@ -5653,7 +5762,7 @@ msgstr "Falls aktiviert, schließt die Escape-Taste aktive Tabs und Fenster."
 
 #: gajim/common/config.py:267
 msgid "Hides the banner in a group chat window"
-msgstr "Versteckt das Banner im Chatraum-Fenster."
+msgstr "Versteckt das Banner im Gruppenchat-Fenster."
 
 #: gajim/common/config.py:268
 msgid "Hides the banner in two persons chat window"
@@ -5661,7 +5770,7 @@ msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster."
 
 #: gajim/common/config.py:269
 msgid "Hides the group chat occupants list in group chat window."
-msgstr "Versteckt die Benutzerliste im Chatraum-Fenster."
+msgstr "Versteckt die Teilnehmerliste im Gruppenchat-Fenster."
 
 #: gajim/common/config.py:270
 msgid ""
@@ -5682,7 +5791,7 @@ msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
-"Liste der Farben, die zum Einfärben der Spitznamen in Chaträumen verwendet "
+"Liste der Farben, die zum Einfärben der Spitznamen in Gruppenchats verwendet "
 "werden sollen (Werte getrennt durch \":\")."
 
 #: gajim/common/config.py:273
@@ -5697,7 +5806,7 @@ msgid ""
 "means we never show the dialog."
 msgstr ""
 "Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
-"werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+"werden? Bei einer leeren Zeichenfolge wird der Dialog niemals gezeigt."
 
 #: gajim/common/config.py:275
 msgid ""
@@ -5705,15 +5814,15 @@ msgid ""
 "we never show the dialog."
 msgstr ""
 "Soll der Bestätigungsdialog zum Blockieren von Benutzern angezeigt werden? "
-"Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+"Bei einer leeren Zeichenfolge wird der Dialog niemals gezeigt."
 
 #: gajim/common/config.py:276
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Soll der Bestätigungsdialog für den speziellen Chatstatus angezeigt werden? "
-"Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+"Soll der Bestätigungsdialog für den benutzerdefinierten Chatstatus angezeigt "
+"werden? Bei einer leeren Zeichenfolge wird der Dialog niemals gezeigt."
 
 #: gajim/common/config.py:277
 msgid ""
@@ -5721,9 +5830,9 @@ msgid ""
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
-"Falls aktiviert, können Sie eine negative Priorität im Konto-Bearbeiten-"
-"Fenster setzen. VORSICHT: Wenn Sie mit einer negativen Priorität angemeldet "
-"sind ehalten Sie keine Nachrichten mehr vom Server."
+"Falls aktiviert, können Sie eine negative Priorität im "
+"Kontobearbeitungsfenster setzen. VORSICHT: Wenn Sie mit einer negativen "
+"Priorität angemeldet sind, erhalten Sie keine Nachrichten mehr vom Server."
 
 #: gajim/common/config.py:278
 msgid ""
@@ -5731,7 +5840,7 @@ msgid ""
 "group rows."
 msgstr ""
 "Falls aktiviert, wird die Anzahl der angemeldeten und gesamten Kontakte in "
-"den Konto- und Gruppenreihen angezeigt."
+"den Konto- und Gruppenzeilen angezeigt."
 
 #: gajim/common/config.py:279
 msgid ""
@@ -5787,16 +5896,16 @@ msgstr ""
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Falls aktiviert, wird die Autovervollständigung in Gruppenchats ähnlich der "
-"Autovervollständigung in der Shell sein."
+"Autovervollständigung in einer Shell sein."
 
 #: gajim/common/config.py:287
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
-"Wann die Reihe des Eigenkontakts angezeigt wird. Kann sein \"always"
-"\" (immer), \"when_other_resource\" (wenn eine andere Ressource online ist) "
-"oder \"never\" (niemals)"
+"Bestimmt, unter welchen Bedingungen der eigene Kontakt in der Kontaktliste "
+"angezeigt wird. Dies kann \"always\" (immer), \"when_other_resource\" (wenn "
+"eine andere XMPP-Ressource online ist) oder \"never\" (niemals) sein"
 
 #: gajim/common/config.py:292
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
@@ -5812,35 +5921,34 @@ msgid "If True, You will also see your webcam"
 msgstr "Falls aktiviert, wird auch ihre Webcam angezeigt"
 
 #: gajim/common/config.py:297
-#, fuzzy
 msgid ""
 "If True, Gajim will try to use a STUN server when using Jingle. The one in "
 "\"stun_server\" option, or the one given by the XMPP server."
 msgstr ""
-"Falls aktiviert, wird Gajim versuchen einen STUN server für Jingle zu "
-"verwenden. Entweder jenen in der \"stun_server\" Option, oder einen vom "
-"Jabber-Server vorgegebenen Server."
+"Falls aktiviert, wird Gajim versuchen einen STUN-Server für Jingle zu "
+"verwenden. Entweder jenen in der \"stun_server\" Option, oder einen vom XMPP-"
+"Server vorgegebenen Server."
 
 #: gajim/common/config.py:298
-#, fuzzy
 msgid "STUN server to use when using Jingle"
-msgstr "Zu benutzender STUN server für Jingle"
+msgstr "Für Jingle zu benutzender STUN-Server"
 
 #: gajim/common/config.py:299
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
-"Falls aktiviert, wird Gajim die Zuordnung der Teilnehmer im Gruppenchat "
-"anzeigen, indem ein farbiges Quadrat zum Status-Icon hinzugefügt wird."
+"Falls aktiviert, wird Gajim die Gruppenzugehörigkeit der Teilnehmer im "
+"Gruppenchat anzeigen, indem ein farbiges Quadrat zum Status-Icon hinzugefügt "
+"wird."
 
 #: gajim/common/config.py:300
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured"
 msgstr ""
-"Proxy der verwendet wird für alle ausgehenden Verbindungen von Kontos ohne "
-"spezifische Proxykonfiguration"
+"Proxy, der für alle ausgehenden Verbindungen verwendet wird, wenn das Konto "
+"keine spezifische Proxy-Konfiguration hat"
 
 #: gajim/common/config.py:301
 msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
@@ -5869,11 +5977,10 @@ msgid "Show a mini avatar in chat window tabs and in window icon"
 msgstr "Miniavatar Chatfenstertabs und Fenstericons anzeigen"
 
 #: gajim/common/config.py:305
-#, fuzzy
 msgid "If True, Gajim will use the Systems Keyring to store account passwords."
 msgstr ""
-"Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, "
-"um die Passwörter der Konten zu speichern."
+"Falls aktiviert, wird Gajim den Schlüsselbund des Systems verwenden, um die "
+"Konto-Passwörter zu speichern."
 
 #: gajim/common/config.py:306
 msgid "Sets the encoding used by python-gnupg"
@@ -5897,8 +6004,8 @@ msgid ""
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 "Status bei automatischer Verbindung. Mögliche Werte: Angemeldet, Frei zum "
-"Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar. (Diese Option "
-"kann nur verwendet werden, wenn \"restore_last_status\" deaktiviert ist.)"
+"Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar. HINWEIS: Diese "
+"Option kann nur verwendet werden, wenn restore_last_status deaktiviert ist"
 
 #: gajim/common/config.py:332
 msgid "If enabled, restore the last status that was used."
@@ -5936,15 +6043,11 @@ msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
-msgstr ""
-"Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch "
-"Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
+msgstr "Erlaube unverschlüsselte Verbindungen"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
@@ -5955,7 +6058,7 @@ msgstr ""
 "SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 or "
 "XEP-0078"
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -5963,59 +6066,58 @@ msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
 "übertragen wird. Mögliche Optionen sind 'warn', 'connect', 'disconnect'"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-"
 "Bibliothek geschützte Verbindung übertragen wird."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Warnmeldung anzeigen, bevor das PLAIN Passwort über eine unsichere "
 "Verbindung übertragen wird."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
-"Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
+"Durch Leerzeichen getrennte Liste der SSL-Fehler, die zu ignorieren sind."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
-"Durch Leerzeichen getrennte Liste von JIDs für die keine Logs gespeichert "
-"werden. Sie können auch Accountnamen verwenden um für diesen Account nichts "
-"zu speichern."
+"Durch Leerzeichen getrennte Liste von Jabber-IDs, für die keine Logs "
+"gespeichert werden. Sie können auch einen Kontonamen verwenden, um für "
+"dieses Konto nichts zu speichern."
 
-#: gajim/common/config.py:359
-#, fuzzy
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
-"Beim starten von Gajim Logs herunterladen. (Falls Server XEP-0136 oder "
-"XEP-0313 unterstützt)"
+"Beim Starten wird Gajim auf dem Server gespeicherte Logs herunterladen, wenn "
+"der Server XEP-0313 unterstützt"
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
-"Durch Leerzeichen getrennte Liste von JIDs für welche keine Logs gespeichert "
-"werden können, falls der Benutzer dies wünscht."
+"Durch Leerzeichen getrennte Liste von Jabber-IDs, für welche keine Logs "
+"gespeichert werden können, falls der Benutzer dies wünscht."
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Whitespace nach Untätigkeit gesendet"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP Ping nach Untätigkeit gesendet"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
@@ -6023,11 +6125,11 @@ msgstr ""
 "Wie viele Sekunden soll auf eine Ping Antwort gewartet werden, bevor neu "
 "verbunden wird?"
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2-Workaround"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -6036,32 +6138,33 @@ msgstr ""
 "file_transfer_proxies Option definierten Proxys für den Dateitransfer "
 "verwenden."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
-"Falls aktiviert, wird Gajim beim Start Dateiübertragungsproxies testen. Es "
-"ist bekannt, dass dieser Test bei Openfire Proxies immer fehlschlägt."
+"Falls aktiviert, wird Gajim die Dateiübertragungsproxies beim Starten "
+"testen, um deren Funktion sicherzustellen. Es ist bekannt, dass dieser Test "
+"bei Openfire Proxies immer fehlschlägt."
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Antwort auf Empfangsbestätigungsanfragen"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Empfangsbestätigungen anfordern"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Erlaubt Gajim, Informationen über Ihr Betriebssystem zu übermitteln."
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "Erlaubt Gajim, Ihre lokale Zeit zu übermitteln."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -6069,20 +6172,20 @@ msgstr ""
 "Soll beim Aushandeln einer verschlüsselten Sitzung angenommen werden, dass "
 "Sie Ihre Nachrichten aufzeichnen wollen?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr ""
 "Nachricht, die an Kontakte gesendet wird, die hinzugefügt werden sollen"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
-"Falls aktiviert und vom Server unterstützt, wird Gajim Nachrichten empfangen "
-"die an und von anderen Ressourcen gesendet wurden."
+"Falls aktiviert und vom Server unterstützt, wird Gajim Nachrichten "
+"empfangen, die von anderen XMPP-Ressourcen gesendet oder empfangen wurden."
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
@@ -6090,171 +6193,181 @@ msgstr ""
 "Falls aktiviert, wird Gajim ihre lokale IP an Kontakte schicken um "
 "Dateiübertragungen zu ermöglichen."
 
-#: gajim/common/config.py:407
-#, fuzzy
+#: gajim/common/config.py:406
 msgid "Latest token for OAuth 2.0 authentication."
-msgstr "Letztes token für Oauth2 Authentifizierung."
+msgstr "Letztes Token für OAuth 2.0 Authentifizierung."
 
-#: gajim/common/config.py:408
-#, fuzzy
+#: gajim/common/config.py:407
 msgid "client_id for OAuth 2.0 authentication."
-msgstr "client_id für Oauth2 Authentifizierung."
+msgstr "client_id für OAuth 2.0 Authentifizierung."
 
-#: gajim/common/config.py:409
-#, fuzzy
+#: gajim/common/config.py:408
 msgid "redirect_url for OAuth 2.0 authentication."
-msgstr "redirect_url für die Oauth2 Authentifizierung."
+msgstr "redirect_url für die OAuth 2.0 Authentifizierung."
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
-"Durch Leerzeichen getrennte Liste von JIDs für welche das Chatfenster beim "
-"nächsten Start wieder geöffnet werden soll."
+"Durch Leerzeichen getrennte Liste von Jabber-IDs, für welche das Chatfenster "
+"beim nächsten Start wieder geöffnet werden soll."
+
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr "HTTP Datei-Upload: HTTPS Zertifikat verifizieren"
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+"Bevorzugte Methode für Dateiübertragungen per Ziehen und Ablegen auf das "
+"Chat-Fenster. Zur Verfügung stehen 'httpupload' (Voreinstellung) oder "
+"'jingle'"
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
-msgstr "Sprache, die für die Rechtschreibprüfung verwerdet werden soll"
+msgstr "Sprache, die für die Rechtschreibprüfung verwendet werden soll"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr "Die derzeit aktive Verschlüsselung für diesen Kontakt"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
-"Wie viele zurückliegende Chatzeilen sollen beim Betreten eines Gruppenchats "
+"Wie viele der letzten Nachrichten sollen beim Betreten eines Gruppenchats "
 "abgefragt werden? -1 bedeutet kein Limit, -2 bedeutet globale Einstellung"
 
-#: gajim/common/config.py:481
-#, fuzzy
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
-"Wie viele Minuten zurück sollen Chatzeilen beim Betreten eines Gruppenchats "
+"Wie viele Minuten zurück sollen Nachrichten beim Betreten eines Gruppenchats "
 "abgefragt werden? -1 bedeutet kein Limit, -2 bedeutet globale Einstellung"
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
-"Gib an, ob wir eine Benachrichtigung für jede Nachricht in diesem Raum "
-"bekommen wollen"
+"Geben Sie an, ob Sie über jede Nachricht in diesem Gruppenchat "
+"benachrichtigt werden wollen"
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
-"Gibt an ob Plugins beim Starten wieder aktiviert werden sollen. (Dies wird "
-"beim Beenden gespeichert.) Diese Option sollte NICHT benutzt werden um "
+"Gibt an ob Plugins beim Starten wieder aktiviert werden sollen (wird beim "
+"Beenden von Gajim gespeichert). Diese Option sollte NICHT benutzt werden um "
 "Plugins zu (de-)aktivieren. Benutzen Sie dafür die statttdessen die GUI."
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Essen"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Arbeiten"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
-msgstr "Ich telefoniere."
+msgstr "Ich telefoniere gerade."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Draußen"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
-"Abzuspielender Ton, falls eine Chatraum-Nachricht eines der Wörter aus der "
-"muc_highlights_works-Liste oder Ihren Spitznamen enthält."
+"Abzuspielender Klang, wenn eine Gruppenchat-Nachricht eines der Wörter aus "
+"der muc_highlights_words-Liste oder Ihren Spitznamen enthält."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
-msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
+msgstr ""
+"Klang, der bei einer neuen Gruppenchat-Nachricht abgespielt werden soll"
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
-msgstr "grün"
+msgstr "Grün"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "Lebensmittel"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "Menschlich"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "Marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 msgid "Tor"
 msgstr "Tor"
 
@@ -6300,24 +6413,24 @@ msgstr "Der Status hat sich verändert."
 
 #: gajim/common/commands.py:192 gajim/common/commands.py:225
 msgid "Leave Groupchats"
-msgstr "Verlasse Chaträume"
+msgstr "Verlasse Gruppenchats"
 
 #: gajim/common/commands.py:215
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
-msgstr "%(nickname)s aus dem Chatraum %(room_jid)s"
+msgstr "%(nickname)s aus dem Gruppenchat %(room_jid)s"
 
 #: gajim/common/commands.py:219
 msgid "You have not joined a groupchat."
-msgstr "Sie sind derzeit in keinem Chatraum."
+msgstr "Sie sind derzeit in keinem Gruppenchat."
 
 #: gajim/common/commands.py:226
 msgid "Choose the groupchats you want to leave"
-msgstr "Wählen Sie die Chaträume, die Sie verlassen möchten"
+msgstr "Wählen Sie die Gruppenchats, die Sie verlassen möchten"
 
 #: gajim/common/commands.py:271
 msgid "You left the following groupchats:"
-msgstr "Sie haben folgende Chaträume verlassen:"
+msgstr "Sie haben folgende Gruppenchats verlassen:"
 
 #: gajim/common/commands.py:283
 msgid "Forward unread messages"
@@ -6331,36 +6444,49 @@ msgstr "Alle ungelesenen Nachrichten wurden weitergeleitet."
 msgid "Forward unread message then disconnect"
 msgstr "Ungelesene Nachrichten weiterleiten, dann Verbindung trennen"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Datei ist leer"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Datei existiert nicht"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr "Die Datei ist zu groß, maximal erlaubt ist: %s"
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "Erstelle Cache-Datenbank"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Verschiebe %(src)s nach %(dst)s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s ist eine Datei, sollte aber ein Verzeichnis sein"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
@@ -6370,11 +6496,11 @@ msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indizes"
 
@@ -6383,197 +6509,197 @@ msgstr "migriere Logdatenbank zu Indizes"
 msgid "%s is not a valid loglevel"
 msgstr "%s ist kein gültiger Loglevel."
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Das Zertifikat des Ausstellers ist nicht verfügbar."
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Die Zertifikats-CRL ist nicht verfügbar."
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Die Zertifikatsunterschrift konnte nicht entschlüsselt werden."
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Die CRL-Unterschrift konnte nicht entschlüsselt werden."
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Der öffentliche Schlüssel konnte nicht entschlüsselt werden."
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Fehler bei der Zertifikat-Unterschrift"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Fehler bei der CRL-Unterschrift"
 
 # TODO: How should we handle full sentences that miss a . at their end in the original string?
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig."
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen."
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "Die CRL ist nocht nicht gültig."
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "Die CRL ist abgelaufen."
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatfehler im \"notBefore\"-Feld des Zertifikats"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatfehler im \"notAfter\"-Feld des Zertifikats"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatfehler im \"lastUpdate\"-Feld der CRL"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatfehler im \"nextUpdate\"-Feld der CRL"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Zu wenig Speicher"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
-msgstr "Selbstsigniertes Zertifikat in der Zertifikatkette"
+msgstr "Selbstsigniertes Zertifikat in der Zertifikatskette"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Das lokale Herausgeberzertifikat ist nicht verfügbar."
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Das erste Zertifikat konnte nicht überprüft werden."
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Zertifikatkette zu lang"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Zertifikat wurde widerrufen"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Ungültiges CA-Zertifikat"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Pfadlängenbeschränkung überschritten"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Nicht unterstützter Zertifikatsverwendungszweck"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Zertifikat abgelehnt"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Betreffs-Aussteller unpassend"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Zertifizierungsstelle und Betreffsschlüssel unpassend"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Zertifizierungsstelle und Aussteller-Seriennummer unpassend"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 "Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des "
 "Zertifikats."
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen der Anwendung"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Der Server %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
 "%(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr ""
 "Die Verbindung mit \"%(host)s\" über den Proxy \"%(proxy)s\" konnte nicht "
 "hergestellt werden"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Die Verbindung mit \"%(host)s\" konnte nicht hergestellt werden"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server antwortete: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird "
 "wiederhergestellt."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Die Authentizität des %s Zertifikats könnte ungültig sein"
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6582,7 +6708,7 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6591,7 +6717,7 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -6600,31 +6726,31 @@ msgstr ""
 "Die Authentizität des %s Zertifikats könnte ungültig sein.\n"
 "Das Zertifikat deckt die Domain nicht ab."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
-msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
+msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden."
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Kontakt gesendet: \"%(jid)s\" (%(name)s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Gesendete Kontakte:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
 
@@ -6646,10 +6772,10 @@ msgstr "D-Bus läuft nicht korrekt auf diesem Rechner: System Bus no present"
 
 #: gajim/common/dbus_support.py:61
 msgid "D-Bus does not run correctly on this machine: session bus not present"
-msgstr "D-Bus läuft nicht korrekt auf diesem Rechner: Session Bus not present"
+msgstr ""
+"D-Bus läuft nicht korrekt auf diesem Rechner: Session-Bus nicht gefunden"
 
 #: gajim/common/multimedia_helpers.py:40
-#, fuzzy
 msgid "Default device"
 msgstr "Standardgerät"
 
@@ -7400,7 +7526,7 @@ msgstr "Region"
 
 #: gajim/common/pep.py:211
 msgid "room"
-msgstr "Chatraum"
+msgstr "Raum"
 
 #: gajim/common/pep.py:212
 msgid "speed"
@@ -7467,7 +7593,7 @@ msgid ""
 "Error was:\n"
 "%(error)s"
 msgstr ""
-"Konnte %s nicht aufsetzen. Überprüfen Sie Ihre Konfiguration\n"
+"Konnte %(text)s nicht einrichten. Überprüfen Sie Ihre Konfiguration.\n"
 "\n"
 "Pipeline war:\n"
 "%(pipeline)s\n"
@@ -7491,280 +7617,301 @@ msgstr "Videoaufnahme"
 msgid "video output"
 msgstr "Videoausgabe"
 
-#: gajim/common/helpers.py:295
-#, fuzzy
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Der Servername muss zwischen 1 und 1023 Zeichen lang sein"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
-msgstr "Ungültiges Zeichen im Rechnernamen."
+msgstr "Ungültiges Zeichen im Hostname."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Server-Adresse benötigt."
 
-#: gajim/common/helpers.py:309
-#, fuzzy
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Der Benutzername muss zwischen 1 und 1023 Zeichen lang sein"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
-msgstr "Ungültiges Zeichen im Benutzernamen"
+msgstr "Ungültiges Zeichen im Benutzernamen."
 
-#: gajim/common/helpers.py:323
-#, fuzzy
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Der Resourcenname muss zwischen 1 und 1023 Zeichen lang sein"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
-msgstr "Ungültiges Zeichen in der Ressource."
+msgstr "Ungültiges Zeichen in der XMPP-Ressource."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "Verfügb_ar"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Unbekannt"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Hat Fehler"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Keines"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "An"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Von"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Beide"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Keine Abonnements anfragen"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Keine"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Besucher"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Besucher"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: gajim/common/helpers.py:521
-#, fuzzy
+#: gajim/common/helpers.py:522
 msgid "is composing a message…"
-msgstr "schreibt im Moment …"
+msgstr "schreibt im Moment…"
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "macht gerade eine Schreibpause"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
-#: gajim/common/helpers.py:1154
-#, fuzzy, python-format
+#: gajim/common/helpers.py:1155
+#, python-format
 msgid "from room %s"
-msgstr "Vom Chatraum %s"
+msgstr "von Gruppenchat %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
-#, fuzzy, python-format
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
+#, python-format
 msgid "from user %s"
-msgstr " vom Benutzer %s"
+msgstr "vom Benutzer %s"
 
-#: gajim/common/helpers.py:1159
-#, fuzzy, python-format
+#: gajim/common/helpers.py:1160
+#, python-format
 msgid "from %s"
-msgstr "Von %s"
+msgstr "von %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d neues Ereignis"
 msgstr[1] "%d neue Ereignisse"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
-msgstr "Hallo, Ich bin $name"
+msgstr "Hallo, Ich bin $name."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Konnte Bild nicht laden"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr "PyCURL ist nicht installiert"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 msgid "Error loading image"
-msgstr "Fehler beim Laden des Bild"
+msgstr "Fehler beim Laden des Bildes"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig "
 "angekommen"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 "Diese Nachricht wurde mit OTR verschlüsselt und konnte nicht entschlüsselt "
 "werden."
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
-"Diese Nachricht wurde mit Legaxy OpenPGP verschlüsselt und konnte nicht "
+"Diese Nachricht wurde mit Legacy-OpenPGP verschlüsselt und konnte nicht "
 "entschlüsselt werden. Sie können das PGP-Plugin installieren, das solche "
 "Nachrichten verarbeiten kann."
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 "Diese Nachricht wurde mit OpenPGP für XMPP verschlüsselt und konnte nicht "
 "entschlüsselt werden."
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 "Diese Nachricht wurde mit %s verschlüsselt und konnte nicht entschlüsselt "
 "werden."
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "Nachricht"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Ich würde Sie gerne als Kontakt zu meiner Kontaktliste hinzufügen."
 
 #: gajim/common/exceptions.py:46
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see https://dev."
 "gajim.org/gajim/gajim/wikis/help/DatabaseBackup) or remove it (all history "
 "will be lost)."
 msgstr ""
 "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
-"reparieren (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu "
-"löschen (dabei gehen alle Verläufe verloren)."
+"reparieren (Dokumentation in Englisch https://dev.gajim.org/gajim/gajim/"
+"wikis/help/DatabaseBackup) oder zu löschen (dabei gehen alle "
+"Unterhaltungsverläufe verloren)."
 
 #: gajim/common/exceptions.py:60
 msgid "Service not available: Gajim is not running, or remote_control is False"
@@ -7778,7 +7925,7 @@ msgid ""
 "Session bus is not available.\n"
 "Try reading %(url)s"
 msgstr ""
-"Session Bus ist nicht verfügbar.\n"
+"Session-Bus ist nicht verfügbar.\n"
 "Bitte lesen Sie %(url)s"
 
 #: gajim/common/exceptions.py:94
@@ -7787,46 +7934,46 @@ msgid ""
 "System bus is not available.\n"
 "Try reading %(url)s"
 msgstr ""
-"Session Bus ist nicht verfügbar.\n"
+"System-Bus ist nicht verfügbar.\n"
 "Bitte lesen Sie %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bitte überprüfen Sie, ob Avahi bzw. Bonjour installiert ist."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Lokaler Dienst konnte nicht gestartet werden"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Die Verbindung mit Port %d ist fehlgeschlagen."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Bitte überprüfen Sie, ob avahi-daemon läuft."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Der Status des Kontos \"%s\" konnte nicht geändert werden."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Die Nachricht konnte nicht gesendet werden."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Der Kontakt ist offline. Ihre Nachricht konnte nicht gesendet werden."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7866,43 +8013,37 @@ msgstr ""
 msgid "_Reset to default"
 msgstr "Auf Standard zu_rücksetzen"
 
-# TODO: Synchronize with other strings concerning bookmarks
 #: gajim/data/gui/join_groupchat_window.ui:34
-#, fuzzy
 msgid "Bookmark this Groupchat"
-msgstr "Diesen _Chatraum merken"
+msgstr "Diesen Gruppenchat speichern"
 
 #: gajim/data/gui/join_groupchat_window.ui:51
 msgid "Join this Groupchat everytime Gajim is started"
 msgstr "Diesem Gruppenchat jedes Mal beitreten, wenn Gajim gestartet wird"
 
 #: gajim/data/gui/join_groupchat_window.ui:69
-#, fuzzy
 msgid "Bookmark"
-msgstr "Chatraum zu den Lesezeichen _hinzufügen"
+msgstr "Gruppenchat speichern"
 
 #: gajim/data/gui/join_groupchat_window.ui:82
-#, fuzzy
 msgid "Autojoin"
-msgstr "A_utomatisch verbinden"
+msgstr "Automatisch verbinden"
 
 #: gajim/data/gui/join_groupchat_window.ui:119
 msgid "Account"
 msgstr "Konto"
 
 #: gajim/data/gui/join_groupchat_window.ui:226
-#, fuzzy
 msgid "Room"
-msgstr "Chatraum:"
+msgstr "Gruppenchat"
 
 #: gajim/data/gui/join_groupchat_window.ui:238
-#, fuzzy
 msgid "Recently"
-msgstr "Kürzlich:"
+msgstr "Zuletzt verwendet"
 
 #: gajim/data/gui/join_groupchat_window.ui:290
 msgid "Search the rooms on this server"
-msgstr "Die Räume dieses Servers durchsuchen"
+msgstr "Die Gruppenchats dieses Servers durchsuchen"
 
 #: gajim/data/gui/manage_proxies_window.ui:12
 msgid "HTTP Connect"
@@ -7918,7 +8059,7 @@ msgstr "BOSH"
 
 #: gajim/data/gui/manage_proxies_window.ui:25
 msgid "Manage Proxy Profiles"
-msgstr "Proxy-Verwaltung"
+msgstr "Verwaltung der Proxy-Profile"
 
 #: gajim/data/gui/manage_proxies_window.ui:148
 msgid "_Name:"
@@ -7985,7 +8126,7 @@ msgstr "Lokale Jabber-ID:"
 #: gajim/data/gui/tooltip_roster_contact.ui:55
 #: gajim/data/gui/tooltip_gc_contact.ui:75
 msgid "Resource:"
-msgstr "Ressource:"
+msgstr "XMPP-Ressource:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:80
 #: gajim/data/gui/tooltip_roster_contact.ui:110
@@ -7995,7 +8136,7 @@ msgstr "Status:"
 #: gajim/data/gui/zeroconf_information_window.ui:89
 #: gajim/data/gui/history_window.ui:197
 msgid "_Log conversation history"
-msgstr "Unterhaltungsver_lauf"
+msgstr "Unterhaltungsver_lauf speichern"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:360
@@ -8069,6 +8210,10 @@ msgstr "Ver_bannen"
 msgid "_Add to Roster"
 msgstr "Zur Kont_aktliste hinzufügen"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+msgid "_Execute command"
+msgstr "B_efehl ausführen"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8081,11 +8226,11 @@ msgstr "Immer"
 #: gajim/data/gui/preferences_window.ui:156
 #: gajim/data/gui/archiving_313_preferences_window.ui:31
 msgid "Never"
-msgstr "Nie"
+msgstr "Niemals"
 
 #: gajim/data/gui/archiving_313_preferences_item.ui:96
 msgid "Preference:"
-msgstr "Präferenz"
+msgstr "Präferenz:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:125
 msgid "Idle since:"
@@ -8107,15 +8252,15 @@ msgstr "Lied:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:191
 msgid "Location:"
-msgstr "Position:"
+msgstr "Standort:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:255
 msgid "OpenPGP:"
-msgstr "OpenPGP: "
+msgstr "OpenPGP:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:281
 msgid "Subscription:"
-msgstr "Abonnement: "
+msgstr "Abonnement:"
 
 #: gajim/data/gui/zeroconf_context_menu.ui:11
 #: gajim/data/gui/account_context_menu.ui:11
@@ -8125,7 +8270,7 @@ msgstr "_Status"
 #: gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 msgid "_Modify Account..."
-msgstr "_Konto bearbeiten…"
+msgstr "_Konto bearbeiten..."
 
 #: gajim/data/gui/atom_entry_window.ui:8
 msgid "New entry received"
@@ -8149,23 +8294,23 @@ msgstr "Nächster Eintrag"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:11
 msgid "Change _Nickname..."
-msgstr "Spitz_name ändern …"
+msgstr "Spitz_name ändern..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 msgid "_Manage Room"
-msgstr "Chatraum _verwalten"
+msgstr "Gruppenchat _verwalten"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
-msgstr "_Thema ändern …"
+msgstr "_Thema ändern..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 msgid "Configure _Room..."
-msgstr "Chat_raum einrichten …"
+msgstr "_Gruppenchat konfigurieren..."
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 msgid "_Destroy Room"
-msgstr "_Chatraum auflösen"
+msgstr "_Gruppenchat auflösen"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
@@ -8289,7 +8434,7 @@ msgstr "<b>Avatar:</b>"
 
 #: gajim/data/gui/profile_window.ui:540
 msgid "Click to set your avatar"
-msgstr "Hier klicken, um den Avatar zu auszuwählen."
+msgstr "Hier klicken, um den Avatar auszuwählen."
 
 #: gajim/data/gui/profile_window.ui:566
 #: gajim/data/gui/vcard_information_window.ui:702
@@ -8342,46 +8487,47 @@ msgstr "Über"
 msgid "Con_tinue"
 msgstr "_Weiter"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pause"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
 #: gajim/data/gui/filetransfers.ui:50
 msgid "_Open Containing Folder"
-msgstr "Öffne _Ordner"
+msgstr "In Dateiverwaltung _anzeigen"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Dateiübertragungen"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
-msgstr "Dateiübertragungs-Liste"
+msgstr "Liste der Dateiübertragungen"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
-msgstr "Eine Liste der aktiven, fertigen und angehaltenen Dateiübertragungen"
+msgstr ""
+"Eine Liste der aktiven, abgeschlossenen und angehaltenen Dateiübertragungen"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Aufrä_umen"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Entfernt beendete, abgebrochene und fehlgeschlagene Dateiübertragungen aus "
-"der Liste."
+"der Liste"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
-msgstr "Entferne Dateiübertragung aus der Liste"
+msgstr "Entferne Dateiübertragung aus der Liste."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8389,43 +8535,48 @@ msgstr ""
 "Diese Aktion entfernt eine Dateiübertragung aus der Liste. Falls die "
 "Übertragung aktiv ist, wird sie erst gestoppt und anschließend entfernt."
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Bricht die ausgewählte Dateiübertragung ab und löscht die unvollständige "
 "Datei"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Dateiübertragung abbrechen"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
-msgstr "Bricht die ausgewählte Dateiübertragung ab."
+msgstr "Bricht die ausgewählte Dateiübertragung ab"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+msgid "_Close"
+msgstr "_Schließen"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Versteckt das Fenster."
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "Be_nachrichtige mich, wenn die Dateiübertragung abgeschlossen ist"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
-msgstr "Zeigt eine Liste von Dateiübertragungen an."
+msgstr ""
+"Zeigt eine Liste der Dateiübertragungen zwischen Ihnen und Ihren Kontakten an"
 
 #: gajim/data/gui/service_registration_window.ui:18
 msgid "Register to"
 msgstr "Registrieren auf"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8455,20 +8606,19 @@ msgstr "Schriftart"
 msgid "Clear formatting"
 msgstr "Formatierung löschen"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
+msgid "Choose an encryption"
+msgstr "Art der Verschlüsselung auswählen"
+
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "Emoticons (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
-#, fuzzy
-msgid "Choose an encryption"
-msgstr "Clientzertifikat auswählen …"
-
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "Ereignisarten"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "Ereignisbeschreibung"
 
@@ -8520,7 +8670,7 @@ msgstr "<b>0</b>"
 msgid "<b>#</b>"
 msgstr "<b>#</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "Nr."
 
@@ -8530,7 +8680,7 @@ msgstr "<b>Jabber-ID:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:69
 msgid "<b>Resource:</b>"
-msgstr "<b>Ressource:</b>"
+msgstr "<b>XMPP-Ressource:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:83
 msgid "<b>Status:</b>"
@@ -8570,7 +8720,7 @@ msgstr "<b>Abonnement:</b>"
 #: gajim/data/gui/vcard_information_window.ui:912
 #: gajim/data/gui/vcard_information_window.ui:1310
 msgid "button"
-msgstr "Button"
+msgstr "Schaltfläche"
 
 #: gajim/data/gui/vcard_information_window.ui:1398
 msgid "Comments"
@@ -8578,15 +8728,15 @@ msgstr "Kommentare"
 
 #: gajim/data/gui/gajim_themes_window.ui:12
 msgid "Account row"
-msgstr "Kontoreihe"
+msgstr "Kontozeile"
 
 #: gajim/data/gui/gajim_themes_window.ui:15
 msgid "Group row"
-msgstr "Gruppenreihe"
+msgstr "Gruppenzeile"
 
 #: gajim/data/gui/gajim_themes_window.ui:18
 msgid "Contact row"
-msgstr "Kontaktreihe"
+msgstr "Kontaktzeile"
 
 #: gajim/data/gui/gajim_themes_window.ui:21
 msgid "Chat Banner"
@@ -8614,22 +8764,22 @@ msgstr "Schriftart:"
 
 #: gajim/data/gui/gajim_themes_window.ui:375
 msgid "Composing"
-msgstr "Erstellen"
+msgstr "Tippt"
 
 #: gajim/data/gui/gajim_themes_window.ui:387
 msgid "Paused"
-msgstr "Unterbrochen"
+msgstr "Pausiert"
 
 #: gajim/data/gui/gajim_themes_window.ui:399
 msgid "Gone"
-msgstr "Weg"
+msgstr "Gegangen"
 
 #: gajim/data/gui/gajim_themes_window.ui:411
 msgid ""
 "MUC\n"
 "Messages"
 msgstr ""
-"MUC\n"
+"Gruppenchat\n"
 "Nachrichten"
 
 #: gajim/data/gui/gajim_themes_window.ui:424
@@ -8637,12 +8787,12 @@ msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
-"an MUC gerichtete\n"
-"Nachrichten"
+"An Gruppenchat\n"
+"gerichtete Nachrichten"
 
 #: gajim/data/gui/gajim_themes_window.ui:510
 msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Tabellenfarben des Chat-Status</b>"
+msgstr "<b>Farbe der Tabs nach Chat-Status</b>"
 
 #: gajim/data/gui/preferences_window.ui:48
 msgid "Use default applications"
@@ -8655,12 +8805,12 @@ msgstr "Benutzerdefiniert"
 #: gajim/data/gui/preferences_window.ui:62
 #: gajim/data/gui/preferences_window.ui:79
 msgid "All chat states"
-msgstr "Alle Chatstatus"
+msgstr "Jeden Chatstatus"
 
 #: gajim/data/gui/preferences_window.ui:65
 #: gajim/data/gui/preferences_window.ui:82
 msgid "Composing only"
-msgstr "Nur verfassen"
+msgstr "Nur Tippbenachrichtigung"
 
 #: gajim/data/gui/preferences_window.ui:99
 msgid "Only when pending events"
@@ -8668,7 +8818,7 @@ msgstr "Nur bei anhängenden Ereignissen"
 
 #: gajim/data/gui/preferences_window.ui:113
 msgid "Pop it up"
-msgstr "Aufpoppen"
+msgstr "Öffne Nachricht"
 
 #: gajim/data/gui/preferences_window.ui:116
 msgid "Notify me about it"
@@ -8700,7 +8850,7 @@ msgstr "Abgelöste Kontaktliste mit Chat gruppiert nach Typ"
 
 #: gajim/data/gui/preferences_window.ui:159
 msgid "Last state"
-msgstr "Letzter Status"
+msgstr "Wie zuletzt"
 
 #: gajim/data/gui/preferences_window.ui:195
 #: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:188
@@ -8717,7 +8867,7 @@ msgid ""
 "group chats"
 msgstr ""
 "Falls aktiviert, werden die Avatare der Kontakte in der Kontaktliste und in "
-"Chaträumen eingeblendet."
+"Gruppenchats angezeigt."
 
 #: gajim/data/gui/preferences_window.ui:255
 msgid "Display status _messages of contacts in roster"
@@ -8729,7 +8879,7 @@ msgid ""
 "name, in roster window and in group chats"
 msgstr ""
 "Falls aktiviert, wird unter dem Namen jeden Kontaktes in der Kontaktliste "
-"und in Chaträumen die Statusnachricht angezeigt."
+"und in Gruppenchats die Statusnachricht angezeigt."
 
 #: gajim/data/gui/preferences_window.ui:273
 msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
@@ -8754,11 +8904,11 @@ msgstr "in der _Kontaktliste"
 
 #: gajim/data/gui/preferences_window.ui:325
 msgid "in _group chats"
-msgstr "in Chat_räumen"
+msgstr "in _Gruppenchats"
 
 #: gajim/data/gui/preferences_window.ui:354
 msgid "<b>Roster Appearance</b>"
-msgstr "<b>Aussehen der Kontaktliste</b>"
+msgstr "<b>Erscheinungsbild der Kontaktliste</b>"
 
 #: gajim/data/gui/preferences_window.ui:384
 msgid ""
@@ -8778,7 +8928,7 @@ msgstr "_Fensterverhalten:"
 
 #: gajim/data/gui/preferences_window.ui:420
 msgid "_Show roster on startup:"
-msgstr "Kontaktli_ste beim Start anzeigen"
+msgstr "Kontaktli_ste beim Start anzeigen:"
 
 #: gajim/data/gui/preferences_window.ui:431
 msgid "_Ignore rich content in incoming messages"
@@ -8805,13 +8955,13 @@ msgid ""
 msgstr ""
 "Falls aktiviert, werden Rechtschreibfehler im Chat-Eingabefenster farblich "
 "hervorgehoben. Wenn keine Sprache im Eingabefeld festgelegt wurde (per "
-"Rechtsklick), wird die Standardsprache für diesen Kontakt oder Chatraum "
+"Rechtsklick), wird die Standardsprache für diesen Kontakt oder Gruppenchat "
 "verwendet."
 
 #: gajim/data/gui/preferences_window.ui:466
-#, fuzzy
 msgid "Notify by icon when your messages are received"
-msgstr "Icon anzeigen wenn Nachrichten ankommen"
+msgstr ""
+"Durch Icon darüber benachrichtigen, wenn Ihre Nachrichten empfangen wurden"
 
 #: gajim/data/gui/preferences_window.ui:531
 msgid "Show avatar in chat tabs"
@@ -8819,7 +8969,7 @@ msgstr "Avatar in Chat-Tabs anzeigen"
 
 #: gajim/data/gui/preferences_window.ui:552
 msgid "<b>Chat Appearance</b>"
-msgstr "<b>Chat-Aussehen</b>"
+msgstr "<b>Erscheinungsbild des Chats</b>"
 
 #: gajim/data/gui/preferences_window.ui:607
 msgid "When new event is received:"
@@ -8866,11 +9016,11 @@ msgstr "Klänge ab_spielen"
 #: gajim/data/gui/preferences_window.ui:812
 #: gajim/data/gui/preferences_window.ui:1656
 msgid "Ma_nage..."
-msgstr "Verwalte_n …"
+msgstr "Verwalte_n..."
 
 #: gajim/data/gui/preferences_window.ui:834
 msgid "Allow sound when I'm _busy"
-msgstr "Soundausgabe erlauben, wenn ich _beschäftigt bin"
+msgstr "Die Wiedergabe von Klängen erlauben, wenn ich _beschäftigt bin"
 
 #: gajim/data/gui/preferences_window.ui:856
 msgid "<b>Sounds</b>"
@@ -8951,11 +9101,11 @@ msgid ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 msgstr ""
-"Dieser Text wird als Statusnachricht zum Status Abwesend gesetzt, wenn der "
-"Computer für die angegebene Zeit nicht benutzt wurde. Wenn leer, wird die "
-"aktuelle Statusnachricht belassen. $S kann für die vorherige Statusnachricht "
-"eingesetzt werden. $T kann für die Zeit eingesetzt werden, seit der der "
-"Status auf Abwesend gestellt ist."
+"Dies ist die Statusnachricht, die automatisch im Status \"Abwesend\" gesetzt "
+"wird. Bleibt dieser Text leer, behält Gajim die aktuelle Statusnachricht.\n"
+"$S ist ein Platzhalter für die vorherige Statusnachricht\n"
+"$T ist ein Platzhalter für die Zeit, seit der der Status automatisch auf "
+"\"Abwesend\" gestellt wurde."
 
 #: gajim/data/gui/preferences_window.ui:1117
 msgid ""
@@ -8964,11 +9114,12 @@ msgid ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
-"Dieser Text wird als Statusnachricht zum Status Nicht Verfügbar gesetzt, "
-"wenn der Computer für die angegebene Zeit nicht benutzt wurde. Wenn leer, "
-"wird die aktuelle Statusnachricht belassen. $S kann für die vorherige "
-"Statusnachricht eingesetzt werden. $T kann für die Zeit eingesetzt werden, "
-"seit der der Status auf Nicht Verfügbar gestellt ist."
+"Dies ist die Statusnachricht, die automatisch im Status \"Nicht verfügbar\" "
+"gesetzt wird. Bleibt dieser Text leer, behält Gajim die aktuelle "
+"Statusnachricht.\n"
+"$S ist ein Platzhalter für die vorherige Statusnachricht\n"
+"$T ist ein Platzhalter für die Zeit, seit der der Status automatisch auf "
+"\"Nicht verfügbar\" gestellt wurde."
 
 #: gajim/data/gui/preferences_window.ui:1165
 msgid "<b>Auto Status</b>"
@@ -9021,7 +9172,7 @@ msgstr "Chat-Nachricht:"
 
 #: gajim/data/gui/preferences_window.ui:1537
 msgid "Use system _default"
-msgstr "Benutze System-_Voreinstellung"
+msgstr "Einstellung _des Systems verwenden"
 
 #: gajim/data/gui/preferences_window.ui:1560
 msgid "<b>Font</b>"
@@ -9051,7 +9202,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:1660
 msgid "Configure color and font of the interface"
-msgstr "Farben und Schriftarten für die Oberfläche konfigurieren"
+msgstr "Farben und Schriftarten der Oberfläche konfigurieren"
 
 #: gajim/data/gui/preferences_window.ui:1682
 msgid "<b>Themes</b>"
@@ -9071,19 +9222,19 @@ msgstr "_Statusnachricht:"
 
 #: gajim/data/gui/preferences_window.ui:1752
 msgid "Group chat highlight:"
-msgstr "Hervorhebung von Chatraum-Nachrichten"
+msgstr "Hervorhebung von Gruppenchat-Nachrichten:"
 
 #: gajim/data/gui/preferences_window.ui:1890
 msgid "Your nickname:"
-msgstr "Dein Spitzname:"
+msgstr "Ihr Spitzname:"
 
 #: gajim/data/gui/preferences_window.ui:1904
 msgid "Your message:"
-msgstr "Deine Nachricht:"
+msgstr "Ihre Nachricht:"
 
 #: gajim/data/gui/preferences_window.ui:1916
 msgid "_URL highlight:"
-msgstr "_URL hervorheben:"
+msgstr "_URLs hervorheben:"
 
 #: gajim/data/gui/preferences_window.ui:2041
 msgid "_Reset to Default Colors"
@@ -9091,7 +9242,7 @@ msgstr "Auf Standardfarben zu_rücksetzen"
 
 #: gajim/data/gui/preferences_window.ui:2075
 msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Chatlinien-Farben</b>"
+msgstr "<b>Farben der Chatzeilen</b>"
 
 #: gajim/data/gui/preferences_window.ui:2095
 msgid "Style"
@@ -9119,7 +9270,7 @@ msgstr "Videoausgabegerät"
 
 #: gajim/data/gui/preferences_window.ui:2230
 msgid "Video framerate"
-msgstr "Video Frame-Rate"
+msgstr "Bildwiederholrate"
 
 #: gajim/data/gui/preferences_window.ui:2242
 msgid "Video size"
@@ -9142,8 +9293,8 @@ msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
-"STUN Server Rechnername. Falls nicht definiert, wird Gajim versuchen\n"
-"einen vom Server zu ermitteln."
+"STUN Server Hostname. Falls nicht definiert, wird\n"
+"Gajim versuchen einen vom Server zu ermitteln."
 
 #: gajim/data/gui/preferences_window.ui:2386
 msgid "<i>(example: stun.iptel.org)</i>"
@@ -9159,7 +9310,7 @@ msgstr "E-_Mail-Programm:"
 
 #: gajim/data/gui/preferences_window.ui:2498
 msgid "_Browser:"
-msgstr "_Browser:"
+msgstr "_Webbrowser:"
 
 #: gajim/data/gui/preferences_window.ui:2511
 msgid "_File manager:"
@@ -9191,15 +9342,15 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:2622
 msgid "Allow client / _OS information to be sent"
-msgstr "Erlaube das Senden von Klient-/Betriebssystem-Inf_ormation"
+msgstr "Erlaube das Senden von Client-/Betriebssystem-Inf_ormation"
 
 #: gajim/data/gui/preferences_window.ui:2626
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr ""
-"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
-"festzustellen."
+"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, das von Ihnen genutzte "
+"Betriebssystem zu ermitteln."
 
 #: gajim/data/gui/preferences_window.ui:2640
 msgid "Allow local system time information to be sent"
@@ -9208,35 +9359,35 @@ msgstr "Erlaube das Senden von Systemzeitinformationen"
 #: gajim/data/gui/preferences_window.ui:2644
 msgid "If checked, Gajim will allow others to detect the time on your system"
 msgstr ""
-"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, die Zeit auf ihrem System "
+"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, die Uhrzeit auf ihrem System "
 "festzustellen."
 
 #: gajim/data/gui/preferences_window.ui:2658
 msgid "Log _encrypted chat session"
-msgstr "V_erschlüsselte Sitzungen aufzeichnen"
+msgstr "Unterhaltungesverlauf v_erschlüsselter Sitzungen speichern"
 
 #: gajim/data/gui/preferences_window.ui:2662
-#, fuzzy
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using End-to-End encryption the remote party has to agree on logging, "
 "else the messages will not be logged."
 msgstr ""
-"Falls aktiviert, werden Logs von verschlüsselten Nachrichten aufgezeichnet. "
-"Bitte bedenken Sie, dass bei der Benutzung von ESession-Verschlüsselung der "
-"Chatpartner zustimmen muss; ansonsten wird nichts aufgezeichnet."
+"Falls aktiviert, wird ein lokaler Unterhaltungsverlauf für verschlüsselte "
+"Nachrichten angelegt. Bitte bedenken Sie, dass der Chatpartner bei Benutzung "
+"der ESession-Verschlüsselung zustimmen muss, da ansonsten kein "
+"Unterhaltungsverlauf angelegt wird."
 
 #: gajim/data/gui/preferences_window.ui:2676
 msgid "Allow my _idle time to be sent"
-msgstr "Erlaube das Senden meiner Ze_it der Untätigkeit"
+msgstr "Erlaube das Senden der Ze_it meiner Untätigkeit"
 
 #: gajim/data/gui/preferences_window.ui:2695
 msgid "Global proxy:"
-msgstr "Globaler Proxy"
+msgstr "Globaler Proxy:"
 
 #: gajim/data/gui/preferences_window.ui:2724
 msgid "_Manage..."
-msgstr "_Verwalten …"
+msgstr "_Verwalten..."
 
 #: gajim/data/gui/preferences_window.ui:2743
 msgid "<b>Privacy</b>"
@@ -9252,16 +9403,12 @@ msgstr "<b>Verschiedenes</b>"
 
 #: gajim/data/gui/preferences_window.ui:2810
 msgid "_Open..."
-msgstr "Ö_ffnen …"
+msgstr "Ö_ffnen..."
 
 #: gajim/data/gui/preferences_window.ui:2826
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Erweiterter Konfigurationseditor</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Erweitert"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "_Chat starten"
@@ -9269,11 +9416,11 @@ msgstr "_Chat starten"
 #: gajim/data/gui/contact_context_menu.ui:20
 #: gajim/data/gui/systray_context_menu.ui:36
 msgid "Send Single _Message..."
-msgstr "Einzelne _Nachricht senden …"
+msgstr "Einzelne _Nachricht senden..."
 
 #: gajim/data/gui/contact_context_menu.ui:28
 msgid "Send _File..."
-msgstr "_Datei senden …"
+msgstr "_Datei senden..."
 
 #: gajim/data/gui/contact_context_menu.ui:44
 msgid "Invite _Contacts"
@@ -9281,7 +9428,7 @@ msgstr "_Kontakte einladen"
 
 #: gajim/data/gui/contact_context_menu.ui:73
 msgid "E_xecute Command..."
-msgstr "B_efehl ausführen …"
+msgstr "B_efehl ausführen..."
 
 #: gajim/data/gui/contact_context_menu.ui:82
 msgid "M_anage Contact"
@@ -9289,20 +9436,20 @@ msgstr "Kontakt _verwalten"
 
 #: gajim/data/gui/contact_context_menu.ui:92
 msgid "_Rename..."
-msgstr "_Umbenennen …"
+msgstr "_Umbenennen..."
 
 #: gajim/data/gui/contact_context_menu.ui:99
 msgid "Edit _Groups..."
-msgstr "_Gruppen bearbeiten …"
+msgstr "_Gruppen bearbeiten..."
 
 # TODO: GPG/PGP unification in original strings needed
 #: gajim/data/gui/contact_context_menu.ui:106
 msgid "Assign Open_PGP Key..."
-msgstr "Open_PGP-Schlüssel zuweisen …"
+msgstr "OpenPGP-Schlüssel zuweisen..."
 
 #: gajim/data/gui/contact_context_menu.ui:115
 msgid "Add Special _Notification..."
-msgstr "Spezielle Be_nachrichtigung hinzufügen …"
+msgstr "Spezielle Be_nachrichtigung hinzufügen..."
 
 #: gajim/data/gui/contact_context_menu.ui:129
 msgid "_Subscription"
@@ -9331,7 +9478,7 @@ msgstr "_Ignorieren"
 #: gajim/data/gui/contact_context_menu.ui:197
 #: gajim/data/gui/chat_context_menu.ui:66
 msgid "_Add to Roster..."
-msgstr "Zur Kont_aktliste hinzufügen …"
+msgstr "Zur Kont_aktliste hinzufügen..."
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
@@ -9342,8 +9489,8 @@ msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr ""
-"Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n"
-"verbinden können."
+"Sie müssen ein Konto haben, um sich zum\n"
+"Jabber-Netzwerk verbinden zu können."
 
 #: gajim/data/gui/account_creation_wizard_window.ui:95
 msgid "I already have an account I want to _use"
@@ -9398,15 +9545,15 @@ msgstr "Prox_y:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:450
 msgid "Manage..."
-msgstr "Verwalten…"
+msgstr "Verwalten..."
 
 #: gajim/data/gui/account_creation_wizard_window.ui:465
 msgid "Use custom hostname/port"
-msgstr "Benutzerdefinierten Rechnernamen und Port verwenden"
+msgstr "Benutzerdefinierten Hostname und Port verwenden"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:491
 msgid "_Hostname:"
-msgstr "Rec_hnername:"
+msgstr "_Hostname:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:517
 msgid "_Port:"
@@ -9473,7 +9620,7 @@ msgstr "Gruppen bearbeiten"
 
 #: gajim/data/gui/search_window.ui:42
 msgid "Please wait while retrieving search form..."
-msgstr "Bitte warten Sie, während das Suchformular geladen wird …"
+msgstr "Bitte warten Sie, während das Suchformular geladen wird..."
 
 #: gajim/data/gui/search_window.ui:80
 msgid "_Add contact"
@@ -9489,7 +9636,7 @@ msgstr "Link-Adresse _kopieren"
 
 #: gajim/data/gui/chat_context_menu.ui:19
 msgid "_Open Link in Browser"
-msgstr "Link im Br_owser öffnen"
+msgstr "Link im Webbr_owser öffnen"
 
 #: gajim/data/gui/chat_context_menu.ui:27
 msgid "_Copy JID/Email Address"
@@ -9500,7 +9647,7 @@ msgid "_Open Email Composer"
 msgstr "E-Mail-Pr_ogramm öffnen"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "Chat _starten"
 
@@ -9508,11 +9655,11 @@ msgstr "Chat _starten"
 #: gajim/data/gui/account_context_menu.ui:35
 #: gajim/data/gui/systray_context_menu.ui:28
 msgid "Join _Group Chat"
-msgstr "_Chatraum betreten…"
+msgstr "_Gruppenchat beitreten"
 
 #: gajim/data/gui/change_status_message_dialog.ui:131
 msgid "Save as Preset..."
-msgstr "Als Voreinstellung speichern …"
+msgstr "Als Voreinstellung speichern..."
 
 #: gajim/data/gui/change_status_message_dialog.ui:167
 msgid "Preset messages:"
@@ -9532,7 +9679,7 @@ msgstr "Das Konto auswählen, das Sie synchronisieren möchten"
 
 #: gajim/data/gui/archiving_313_preferences_window.ui:28
 msgid "Roster"
-msgstr "_Kontaktliste"
+msgstr "Kontakte"
 
 #: gajim/data/gui/archiving_313_preferences_window.ui:85
 msgid "Preference"
@@ -9540,7 +9687,11 @@ msgstr "Präferenz"
 
 #: gajim/data/gui/archiving_313_preferences_window.ui:159
 msgid "Default:"
-msgstr "Standard"
+msgstr "Standard:"
+
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr "<b><big>Eingehender Anruf</big></b>"
 
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
@@ -9567,6 +9718,14 @@ msgstr "Spitz_name:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+msgid "Type User ID"
+msgstr "Benutzer-ID eingeben"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+msgid "Type Nickname"
+msgstr "Spitznamen eingeben"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr "Wählen Sie eine Gruppo oder einen Typ von neuer Gruppe aus"
@@ -9603,6 +9762,10 @@ msgstr ""
 "Sie müssen mit dem Transport verbunden sein, um einen\n"
 "Kontakt über dieses Protokoll hinzufügen zu können."
 
+#: gajim/data/gui/roster_window.ui:61
+msgid "Change Status Message…"
+msgstr "Ändere _Statusnachricht…"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Stimmung:</b>"
@@ -9636,12 +9799,12 @@ msgstr "Autoren:"
 #: gajim/data/gui/plugins_window.ui:210 gajim/data/plugins/config_dialog.ui:224
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:224
 msgid "Homepage:"
-msgstr "Homepage:"
+msgstr "Website:"
 
 #: gajim/data/gui/plugins_window.ui:253 gajim/data/plugins/config_dialog.ui:236
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:236
 msgid "Description:"
-msgstr "Beschreibung: "
+msgstr "Beschreibung:"
 
 #: gajim/data/gui/plugins_window.ui:301
 msgid "Uninstall"
@@ -9712,7 +9875,7 @@ msgstr "Verbiete"
 
 #: gajim/data/gui/privacy_list_window.ui:317
 msgid "JabberID"
-msgstr "der Jabber-ID:"
+msgstr "Jabber-ID"
 
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
@@ -9768,7 +9931,7 @@ msgstr "<b>Was möchten Sie tun?</b>"
 
 #: gajim/data/gui/adhoc_commands_window.ui:35
 msgid "Please wait while retrieving command list..."
-msgstr "Bitte warten Sie, während die Befehlsliste empfangen wird …"
+msgstr "Bitte warten Sie, während die Befehlsliste empfangen wird..."
 
 #: gajim/data/gui/adhoc_commands_window.ui:93
 msgid "<b>Choose command to execute:</b>"
@@ -9781,11 +9944,11 @@ msgstr "Noch einmal überprüfen"
 
 #: gajim/data/gui/adhoc_commands_window.ui:194
 msgid "Please wait while the command is being sent..."
-msgstr "Bitte warten Sie, während der Befehl gesendet wird …"
+msgstr "Bitte warten Sie, während der Befehl gesendet wird..."
 
 #: gajim/data/gui/adhoc_commands_window.ui:211
 msgid "Please wait..."
-msgstr "Bitte warten …"
+msgstr "Bitte warten..."
 
 #: gajim/data/gui/adhoc_commands_window.ui:257
 msgid "This jabber entity does not expose any commands."
@@ -9805,7 +9968,7 @@ msgstr "_Persönliche Ereignisse"
 
 #: gajim/data/gui/account_context_menu.ui:49
 msgid "_Add Contact..."
-msgstr "Kont_akt hinzufügen …"
+msgstr "Kont_akt hinzufügen..."
 
 #: gajim/data/gui/account_context_menu.ui:57
 msgid "_Discover Services"
@@ -9813,61 +9976,47 @@ msgstr "_Dienste durchsuchen"
 
 #: gajim/data/gui/account_context_menu.ui:65
 msgid "_Execute Command..."
-msgstr "B_efehl ausführen …"
+msgstr "B_efehl ausführen..."
 
 #: gajim/data/gui/esession_info_window.ui:50
 msgid "_Verify"
 msgstr "_Überprüfen"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Konten"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b>-Informationen)"
 
 #: gajim/data/gui/application_menu.ui:8
-#, fuzzy
 msgid "View"
-msgstr "A_nsicht"
+msgstr "Ansicht"
 
 #: gajim/data/gui/application_menu.ui:11
-#, fuzzy
 msgid "Show Roster"
-msgstr "_Kontaktliste anzeigen"
+msgstr "Kontaktliste anzeigen"
 
 #: gajim/data/gui/application_menu.ui:16
-#, fuzzy
 msgid "Show Offline Contacts"
-msgstr "Abgemeldete K_ontakte anzeigen"
+msgstr "Abgemeldete Kontakte anzeigen"
 
 #: gajim/data/gui/application_menu.ui:21
-#, fuzzy
 msgid "Show Active Contacts"
-msgstr "Nur _aktive Kontakte anzeigen"
+msgstr "Nur aktive Kontakte anzeigen"
 
 #: gajim/data/gui/application_menu.ui:26
-#, fuzzy
 msgid "Show Transports"
-msgstr "T_ransporte anzeigen"
-
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Dateiübertragungen"
+msgstr "Transporte anzeigen"
 
 #: gajim/data/gui/application_menu.ui:43
-#, fuzzy
 msgid "Help"
-msgstr "_Hilfe"
+msgstr "Hilfe"
 
 #: gajim/data/gui/application_menu.ui:46
-#, fuzzy
 msgid "Contents"
-msgstr "In_halte"
+msgstr "Inhalte"
 
 #: gajim/data/gui/application_menu.ui:50
-#, fuzzy
 msgid "FAQ"
-msgstr "_FAQ"
+msgstr "FAQ"
 
 #: gajim/data/gui/application_menu.ui:54
 msgid "Keyboard Shortcuts"
@@ -9882,14 +10031,12 @@ msgid "Start Chat"
 msgstr "Chat starten"
 
 #: gajim/data/gui/application_menu.ui:81
-#, fuzzy
 msgid "Bookmarks"
-msgstr "Chatraum zu den Lesezeichen _hinzufügen"
+msgstr "Gespeicherte Gruppenchats"
 
 #: gajim/data/gui/application_menu.ui:99
-#, fuzzy
 msgid "Quit"
-msgstr "_Beenden"
+msgstr "Beenden"
 
 #: gajim/data/gui/features_window.ui:26
 msgid "<b>List of possible features in Gajim:</b>"
@@ -9897,7 +10044,7 @@ msgstr "<b>Liste der verwendbaren Features:</b>"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:14
 msgid "Manage Bookmarks"
-msgstr "Chatraum-Lesezeichen"
+msgstr "Gespeicherte Gruppenchats"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:120
 msgid "_Title:"
@@ -9913,7 +10060,9 @@ msgstr "A_utomatisch verbinden"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:193
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Falls aktiviert, tritt Gajim diesem Chatraum beim Programmstart bei."
+msgstr ""
+"Falls aktiviert, wird diesem Gruppenchat jedes Mal beigetreten, wenn Gajim "
+"gestartet wird"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:207
 msgid "Minimi_ze on Auto Join"
@@ -9923,35 +10072,23 @@ msgstr "Minimieren bei automatischem Beitritt"
 msgid "Pr_int status:"
 msgstr "Status anze_igen:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Beschreibung"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "Fehler melden"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
-"Ein Programmierfehler wurde erkannt.\n"
-"Der Fehler ist vermutlich nicht fatal, sollte aber \n"
-"trotzdem den Entwicklern gemeldet werden."
+"Ein Programmierfehler wurde erkannt. Der Fehler ist vermutlich nicht "
+"schwerwiegend, sollte aber trotzdem den Entwicklern gemeldet werden."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Abonnementanfrage"
+#: gajim/data/gui/exception_dialog.ui:115
+msgid "Report Bug"
+msgstr "Fehler melden"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Ablehnen"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9959,54 +10096,52 @@ msgstr ""
 "Autorisierung des Kontakts verweigern, so dass er Ihren Status nicht sehen "
 "kann"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Aktionen"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_torisieren"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Kontakt autorisieren, sodass er Ihren Status sehen kann"
 
 #: gajim/data/gui/xml_console_window.ui:121
-#, fuzzy
 msgid "Presence"
-msgstr "_Anwesenheit"
+msgstr "Anwesenheit"
 
 #: gajim/data/gui/xml_console_window.ui:134
 msgid "Iq"
 msgstr "Iq"
 
 #: gajim/data/gui/xml_console_window.ui:149
-#, fuzzy
 msgid "Presets"
-msgstr "_Anwesenheit"
+msgstr "Voreinstellungen"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Freunde einladen!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr ""
-"Sie möchten einen Multi-User-Chat beginnen.\n"
+"Sie treten nun einem Gruppenchat bei.\n"
 "Bitte wählen Sie die Kontakte, die Sie einladen möchten"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr "Spalte"
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Bitte wählen Sie einen MUC-Server aus."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC-Server"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Einladen zu"
 
@@ -10032,7 +10167,7 @@ msgid ""
 msgstr ""
 "Dieser Log-Manager ist nicht zum Ansehen der Logeinträge gedacht. Wenn Sie "
 "nach einer solchen Funktion suchen, benutzen Sie sattdessen das "
-"Verlaufsfenster.\n"
+"Unterhaltungsverlaufsfenster.\n"
 "\n"
 "Benutzen Sie dieses Programm, um Logs zu löschen oder zu exportieren. Sie "
 "können links Logeinträge auswählen und unten die Datenbank durchsuchen."
@@ -10053,24 +10188,20 @@ msgid "_Search Database"
 msgstr "Durch_suche Datenbank"
 
 #: gajim/data/gui/shortcuts_window.ui:8
-#, fuzzy
 msgid "Chat Shortcuts"
-msgstr "Tastenkürzel"
+msgstr "Tastenkürzel für Chat"
 
 #: gajim/data/gui/shortcuts_window.ui:12
-#, fuzzy
 msgid "Message composition"
-msgstr "Nachrichteninhalt"
+msgstr "Nachrichtenerstellung"
 
 #: gajim/data/gui/shortcuts_window.ui:17
-#, fuzzy
 msgid "Send the message"
-msgstr "Nachricht senden"
+msgstr "Senden der Nachricht"
 
 #: gajim/data/gui/shortcuts_window.ui:24
-#, fuzzy
 msgid "Create a new line"
-msgstr "Neue Nachricht"
+msgstr "Neue Zeile erstellen"
 
 #: gajim/data/gui/shortcuts_window.ui:31
 msgid "Select an emoticon"
@@ -10081,57 +10212,44 @@ msgid "Complete a command or a nick"
 msgstr "Einen Befehl oder einen Nicknamen vervollständigen"
 
 #: gajim/data/gui/shortcuts_window.ui:45
-#, fuzzy
 msgid "Previous sent message"
-msgstr "Voreingestellte Nachrichten:"
+msgstr "Letzte gesendete Nachricht"
 
 #: gajim/data/gui/shortcuts_window.ui:52
-#, fuzzy
 msgid "Next sent messages"
-msgstr "Voreingestellte Nachrichten:"
+msgstr "Nächste gesendete Nachricht"
 
 #: gajim/data/gui/shortcuts_window.ui:59
-#, fuzzy
 msgid "Quote previous message"
-msgstr "Statusnachricht"
+msgstr "Zitiere letzte Nachricht"
 
 #: gajim/data/gui/shortcuts_window.ui:66
-#, fuzzy
 msgid "Quote next message"
-msgstr "Nachricht senden"
+msgstr "Zitiere nächste Nachricht"
 
 #: gajim/data/gui/shortcuts_window.ui:73
-#, fuzzy
 msgid "Clear message entry"
-msgstr "Nachricht gesendet"
+msgstr "Nachrichteneintrag entfernen"
 
 #: gajim/data/gui/shortcuts_window.ui:81 gajim/data/gui/shortcuts_window.ui:231
-#, fuzzy
 msgid "Appearance"
-msgstr "<b>Chat-Aussehen</b>"
+msgstr "Erscheinungsbild des Chats"
 
 #: gajim/data/gui/shortcuts_window.ui:86
 msgid "Toggle full / compact view"
 msgstr "Zwischen voller / kompakter Ansicht wechseln"
 
 #: gajim/data/gui/shortcuts_window.ui:94
-#, fuzzy
 msgid "Recent history"
-msgstr "Kürzlich:"
+msgstr "Kürzlich gesendete Nachrichten"
 
 #: gajim/data/gui/shortcuts_window.ui:99
 msgid "Scroll up"
 msgstr "Nach oben rollen"
 
 #: gajim/data/gui/shortcuts_window.ui:106
-#, fuzzy
 msgid "Scroll down"
-msgstr "Nach unten rollen"
-
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "_Löschen"
+msgstr "Nach unten scrollen"
 
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
@@ -10162,44 +10280,36 @@ msgid "Close chat"
 msgstr "Chat schließen"
 
 #: gajim/data/gui/shortcuts_window.ui:172
-#, fuzzy
 msgid "Roster Shortcuts"
-msgstr "Tastenkürzel"
+msgstr "Tastenkürzel für die Kontaktliste"
 
 #: gajim/data/gui/shortcuts_window.ui:195
-#, fuzzy
 msgid "File transfers"
-msgstr "Dateiübertragung"
+msgstr "Dateiübertragungen"
 
 #: gajim/data/gui/shortcuts_window.ui:202
-#, fuzzy
 msgid "Start a new chat"
-msgstr "Chat starten"
+msgstr "Neuen Chat starten"
 
 #: gajim/data/gui/shortcuts_window.ui:209
-#, fuzzy
 msgid "Join a group chat"
-msgstr "in Chat_räumen"
+msgstr "Einem Gruppenchat beitreten"
 
 #: gajim/data/gui/shortcuts_window.ui:216
-#, fuzzy
 msgid "Set the status message"
-msgstr "Statusnachricht"
+msgstr "Statusnachricht festlegen"
 
 #: gajim/data/gui/shortcuts_window.ui:223
-#, fuzzy
 msgid "Quit Gajim"
-msgstr "Gajim"
+msgstr "Gajim beenden"
 
 #: gajim/data/gui/shortcuts_window.ui:236
-#, fuzzy
 msgid "Show offline contacts"
-msgstr "Abgemeldete K_ontakte anzeigen"
+msgstr "Abgemeldete Kontakte anzeigen"
 
 #: gajim/data/gui/shortcuts_window.ui:243
-#, fuzzy
 msgid "Show only active contacts"
-msgstr "Nur _aktive Kontakte anzeigen"
+msgstr "Nur aktive Kontakte anzeigen"
 
 #: gajim/data/gui/shortcuts_window.ui:250
 msgid "Enable roster filtering"
@@ -10210,19 +10320,16 @@ msgid "Contacts"
 msgstr "Kontakte"
 
 #: gajim/data/gui/shortcuts_window.ui:263
-#, fuzzy
 msgid "Contact information"
 msgstr "Kontaktinformationen"
 
 #: gajim/data/gui/shortcuts_window.ui:270
-#, fuzzy
 msgid "Rename contact"
 msgstr "Kontakt umbenennen"
 
 #: gajim/data/gui/shortcuts_window.ui:277
-#, fuzzy
 msgid "Delete contact"
-msgstr "Gesendete Kontakte:"
+msgstr "Kontakt löschen"
 
 #: gajim/data/gui/passphrase_dialog.ui:8
 msgid "Passphrase"
@@ -10235,12 +10342,11 @@ msgstr "Suchen:"
 # TODO test
 #: gajim/data/gui/history_window.ui:75
 msgid "_In date search"
-msgstr "_Datumssuche"
+msgstr "_Suche auf Datum beschränken"
 
 #: gajim/data/gui/history_window.ui:79
-#, fuzzy
 msgid "Only searching within selected day"
-msgstr "Nur in gewähltem Tag suchen"
+msgstr "Nur innerhalb des gewählten Tags suchen"
 
 #: gajim/data/gui/history_window.ui:213
 msgid "_Show status changes"
@@ -10252,7 +10358,7 @@ msgstr "Konfiguration des PEP-Dienstes"
 
 #: gajim/data/gui/manage_pep_services_window.ui:69
 msgid "_Configure"
-msgstr "_Einstellen"
+msgstr "_Konfigurieren"
 
 #: gajim/data/gui/groups_post_window.ui:9
 msgid "Create new post"
@@ -10274,7 +10380,7 @@ msgstr "Bitte füllen Sie das Formular aus."
 
 #: gajim/data/gui/data_form_window.ui:274
 msgid "Room Configuration"
-msgstr "Chatraum-Einstellungen"
+msgstr "Verwaltung des Gruppenchats"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:8
 msgid "Roster Item Exchange"
@@ -10296,6 +10402,14 @@ msgstr "Zeige alle neuen _Ereignisse"
 msgid "Mute Sounds"
 msgstr "Klänge stummschalten"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+msgid "_Preferences"
+msgstr "Einstellungen"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr "Beenden"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "An:"
@@ -10343,7 +10457,7 @@ msgstr "<b>Nachricht:</b> "
 #: gajim/data/plugins/config_dialog.ui:17
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:17
 msgid "Check update after start"
-msgstr "Überprüfe auf Updates nach dem Start"
+msgstr "Überprüfe auf Updates beim Starten"
 
 #: gajim/data/plugins/config_dialog.ui:103
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:103
@@ -10367,7 +10481,7 @@ msgid ""
 "Install /\n"
 "Upgrade"
 msgstr ""
-"Installierten /\n"
+"Installieren /\n"
 "Updaten"
 
 #: gajim/data/plugins/config_dialog.ui:298
@@ -10393,7 +10507,7 @@ msgid ""
 "those plugins:\n"
 "%s"
 msgstr ""
-"Einige Updates sind für ihre Plugins verfügbar. Wollen sie siese Plugins "
+"Es sind einige Updates für ihre Plugins verfügbar. Wollen sie diese Plugins "
 "updaten:\n"
 "%s"
 
@@ -10429,14 +10543,14 @@ msgid ""
 "\n"
 "<tt>[%s]</tt>"
 msgstr ""
-"Ein Fehler trat auf beim Herunterladen\n"
+"Beim Herunterladen trat ein Fehler auf\n"
 "\n"
 "<tt>[%s]</tt>"
 
 #: gajim/data/plugins/plugin_installer.py:330
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:330
 msgid "All selected plugins downloaded"
-msgstr "Alle ausgewählten Plugins heruntergeladen"
+msgstr "Alle ausgewählten Plugins wurden heruntergeladen"
 
 #: gajim/command_system/mapping.py:164 gajim/command_system/mapping.py:174
 #: gajim/command_system/mapping.py:194
@@ -10444,9 +10558,8 @@ msgid "Missing arguments"
 msgstr "Fehlende Parameter"
 
 #: gajim/command_system/mapping.py:261
-#, fuzzy
 msgid "Too many arguments"
-msgstr "Fehlende Parameter"
+msgstr "Zu viele Parameter"
 
 #: gajim/command_system/implementation/execute.py:53
 msgid "Execute expression inside a shell, show output"
@@ -10561,7 +10674,7 @@ msgstr "Namen in einem Gruppenchat ändern"
 #: gajim/command_system/implementation/standard.py:266
 msgid "Open a private chat window with a specified occupant"
 msgstr ""
-"Öffnet ein privates Nachrichtenfenster mit einem gegebenem Chatteilnehmer"
+"Öffnet ein privates Nachrichtenfenster mit dem angegebenen Chatteilnehmer"
 
 #: gajim/command_system/implementation/standard.py:272
 #: gajim/command_system/implementation/standard.py:281
@@ -10575,26 +10688,25 @@ msgstr "Spitzname nicht gefunden"
 msgid ""
 "Open a private chat window with a specified occupant and send him a message"
 msgstr ""
-"Öffnet ein privates Nachrichtenfenster mit einem gegebenem Chatteilnehmer "
+"Öffnet ein privates Nachrichtenfenster mit dem angegebenen Chatteilnehmer "
 "und schickt ihm eine Nachricht"
 
 #: gajim/command_system/implementation/standard.py:284
 msgid "Display or change a group chat topic"
-msgstr "Chatraumthema anzeigen oder ändern"
+msgstr "Thema des Gruppenchats anzeigen oder ändern"
 
 #: gajim/command_system/implementation/standard.py:292
 msgid "Invite a user to a room for a reason"
-msgstr "Benutzer mit Grund in einen Raum einladen"
+msgstr "Benutzer mit Begründung in einen Gruppenchat einladen"
 
 #: gajim/command_system/implementation/standard.py:295
 #, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
-msgstr "Es wurden %(jid)s in %(room_jid)s eingeladen"
+msgstr "Es wurde(n) %(jid)s in %(room_jid)s eingeladen"
 
 #: gajim/command_system/implementation/standard.py:299
-#, fuzzy
 msgid "Join a group chat given by a jid"
-msgstr "in Chat_räumen"
+msgstr "Gruppenchat durch Jabber-ID beitreten"
 
 #: gajim/command_system/implementation/standard.py:307
 msgid ""
@@ -10602,7 +10714,6 @@ msgid ""
 msgstr ""
 "Gruppenchat verlassen und Tab oder Fenster schließen, optional mit Grund"
 
-# TODO unify JID vs jid
 #: gajim/command_system/implementation/standard.py:312
 msgid ""
 "\n"
@@ -10612,14 +10723,15 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    Benutzer nach Namen oder JID aus einem Gruppenchat bannen\n"
+"    Benutzer nach Spitznamen oder Jabber-ID aus einem Gruppenchat bannen\n"
 "\n"
-"    Wird der gegebene Name nicht gefunden wird er als JID interpretiert.\n"
+"    Wird der gegebene Spitzname nicht gefunden wird er als Jabber-ID "
+"interpretiert.\n"
 "    "
 
 #: gajim/command_system/implementation/standard.py:324
 msgid "Kick user by a nick from a groupchat"
-msgstr "Teilnehmer aus Chatraum werfen"
+msgstr "Teilnehmer aus Gruppenchat werfen"
 
 #: gajim/command_system/implementation/standard.py:332
 msgid ""
@@ -10641,17 +10753,17 @@ msgid ""
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
-"Zugehörigkeit eines Teilnehmer in diesem Gruppenchat setzen.\n"
-"    Zugehörigkeit kann einer der folgenden Werte sein:\n"
+"Gruppenzugehörigkeit eines Teilnehmer in diesem Gruppenchat setzen.\n"
+"    Die Gruppenzugehörigkeit kann einen der folgenden Werte annehmen:\n"
 "    owner, admin, member, outcast, none"
 
 #: gajim/command_system/implementation/standard.py:349
 msgid "Invalid affiliation given"
-msgstr "Ungültige Zugehörigkeit"
+msgstr "Ungültige Gruppenzugehörigkeit angegeben"
 
 #: gajim/command_system/implementation/standard.py:357
 msgid "Display names of all group chat occupants"
-msgstr "Namen  aller Teilnehmer im Chatraum anzeigen"
+msgstr "Namen aller Teilnehmer im Gruppenchat anzeigen"
 
 #: gajim/command_system/implementation/standard.py:379
 msgid "Forbid an occupant to send you public or private messages"
@@ -10710,34 +10822,23 @@ msgstr "Überschreiben?"
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr "URI mit Gajim öffnen"
-
-# TODO mark as do not translate?
-# TODO look up if there are other keywords like this in German
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip"
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM-Client"
 
 #: data/org.gajim.Gajim.desktop.in:6 data/org.gajim.Gajim.appdata.xml.in:10
 msgid "A GTK+ Jabber client"
-msgstr "Ein Jabber-Client in GTK+"
+msgstr "Ein Jabber/XMPP-Client in GTK+"
 
 # TODO mark as do not translate?
 # TODO look up if there are other keywords like this in German
 #: data/org.gajim.Gajim.desktop.in:8
-#, fuzzy
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
-msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip"
+msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip;"
 
 #: data/org.gajim.Gajim.desktop.in:12
 msgid "org.gajim.Gajim"
-msgstr ""
+msgstr "org.gajim.Gajim"
 
 #: data/org.gajim.Gajim.appdata.xml.in:12
 msgid ""
@@ -10763,9 +10864,8 @@ msgid "Features:"
 msgstr "Features:"
 
 #: data/org.gajim.Gajim.appdata.xml.in:21
-#, fuzzy
 msgid "Tabbed chat window and single window modes"
-msgstr "Kontaktliste im Einzelfenstermodus auf der rechten Seite anzeigen"
+msgstr "Chat-Fenster im Karteikarten- und Einzel-Modus"
 
 #: data/org.gajim.Gajim.appdata.xml.in:22
 msgid ""
@@ -10773,29 +10873,29 @@ msgid ""
 "group chat transformation"
 msgstr ""
 "Unterstützung für Gruppenchats (mit Multi-User Chat Protokoll), Einladung, "
-"Chat in Gruppenchat Umwandlung"
+"Umwandlung von Chats in Gruppenchats"
 
 #: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Emoticons, avatars, PEP (user activity, mood and tune)"
-msgstr "Emoticons, Avatare, PEP (Nutzeraktivität und Stimmung)"
+msgstr "Emoticons, Avatare, PEP (Benutzeraktivität, Stimmung und Musik)"
 
 #: data/org.gajim.Gajim.appdata.xml.in:24
-#, fuzzy
 msgid "Audio / video conferences"
-msgstr "Audio / Video"
+msgstr "Audio- und Video-Konferenzen"
 
 #: data/org.gajim.Gajim.appdata.xml.in:25
-#, fuzzy
 msgid "File transfer, room bookmarks"
-msgstr "Dateiübertragungsfehler"
+msgstr "Datenübertragung, Gruppenchats speichern"
 
 #: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Metacontacts support"
-msgstr "Unterstützung für Metakontakte"
+msgstr "Unterstützung von Meta-Kontakten"
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Trayicon, speller, extended chat history functionalities"
-msgstr "Trayicon, Rechtschreibkorrektur, erweiterte Chat-History Funktionen"
+msgstr ""
+"Tray-Icon, Rechtschreibprüfung, erweiterte Funktionen für den "
+"Unterhaltungsverlauf"
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "TLS, GPG and End-To-End encryption support"
@@ -10803,12 +10903,11 @@ msgstr "Unterstützung von TLS, GPG und Ende-zu-Ende-Verschlüsselung"
 
 #: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Transport registration support"
-msgstr ""
+msgstr "Unterstützung für Transporte (ICQ, AIM, MSN, usw.)"
 
 #: data/org.gajim.Gajim.appdata.xml.in:30
-#, fuzzy
 msgid "Service discovery including nodes, user search"
-msgstr "Dienste des Kontos %s durchsuchen"
+msgstr "Dienste durchsuchen (inkl. Jabber-Nodes), Benutzer-Suche"
 
 #: data/org.gajim.Gajim.appdata.xml.in:31
 msgid "Wikipedia, dictionary and search engine lookup"
@@ -10819,22 +10918,20 @@ msgid "Multiple accounts support"
 msgstr "Unterstützung mehrerer Konten"
 
 #: data/org.gajim.Gajim.appdata.xml.in:33
-#, fuzzy
 msgid "XML console interface"
 msgstr "XML-Konsole"
 
 #: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Link local (bonjour / zeroconf), BOSH"
-msgstr ""
+msgstr "Link local (bonjour / zeroconf), BOSH"
 
 #: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "Other features via plugins"
-msgstr "Weitere Features durch Plugins"
+msgstr "Erweiterbarer Funktionsumfang durch Plugins"
 
 #: data/org.gajim.Gajim.appdata.xml.in:47
-#, fuzzy
 msgid "Roster, list of contacts"
-msgstr "_Logge die Statusveränderungen von Kontakten"
+msgstr "Kontaktliste, Liste von Kontakten"
 
 #: data/org.gajim.Gajim.appdata.xml.in:51
 msgid "Tabbed chat window"
@@ -10845,14 +10942,44 @@ msgid "Group chat support"
 msgstr "Unterstützung von Gruppenchats"
 
 #: data/org.gajim.Gajim.appdata.xml.in:59
-#, fuzzy
 msgid "Chat history"
-msgstr "Kürzlich:"
+msgstr "Unterhaltungsverlauf"
 
 #: data/org.gajim.Gajim.appdata.xml.in:63
 msgid "Plugin manager"
 msgstr "Plugin-Manager"
 
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP-Konto %s"
+
+#~ msgid "Exception"
+#~ msgstr "Fehler"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>jemand@irgendwo.de</b> möchte Sie als Kontakt zu seiner Kontaktliste "
+#~ "<b>hinzufügen</b>."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch "
+#~ "Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
+
+#~ msgid "_Actions"
+#~ msgstr "_Aktionen"
+
+#~ msgid "Open URI using Gajim"
+#~ msgstr "URI mit Gajim öffnen"
+
+# TODO mark as do not translate?
+# TODO look up if there are other keywords like this in German
+#~ msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+#~ msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip"
+
 #~ msgid "UPower"
 #~ msgstr "UPower"
 
@@ -11071,12 +11198,6 @@ msgstr "Plugin-Manager"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Chat-Schaltflächen verstecken"
 
-#~ msgid "File is empty"
-#~ msgstr "Datei ist leer"
-
-#~ msgid "File does not exist"
-#~ msgstr "Datei existiert nicht"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -11104,51 +11225,6 @@ msgstr "Plugin-Manager"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "Benötigt python-pyopenssl > 0.12 und pyasn1."
 
-#~ msgid "?user status:_Available"
-#~ msgstr "?Benutzerstatus:Verfügb_ar"
-
-#~ msgid "?user status:Available"
-#~ msgstr "?Benutzerstatus:Verfügbar"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?Kontakt hat Status: Unbekannt"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?Kontakt hat Status: Hat einen Fehler"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Abonnement schon vorhanden:Keines"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Frage nach Abonnement: Keine"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Gruppenchat Kontaktrolle: Keine"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Gruppenchat Kontaktverbindung:Keine"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Alle"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Nichts"
-
-#~ msgid "?features:Available"
-#~ msgstr "?Features:Verfügbar"
-
-#~ msgid "?CLI:account"
-#~ msgstr "?CLI:account"
-
-#~ msgid "?CLI:status"
-#~ msgstr "?CLI:status"
-
-#~ msgid "?CLI:message"
-#~ msgstr "?CLI:message"
-
-#~ msgid "?CLI:priority"
-#~ msgstr "?CLI:priority"
-
 #~ msgid "?CLI:uri"
 #~ msgstr "?CLI:uri"
 
@@ -11162,33 +11238,6 @@ msgstr "Plugin-Manager"
 #~ msgstr "?CLI:password"
 
 #, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Chatraum"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Download"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Upload"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?Transferstatus:Pausiert"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Unbekannt"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Unbekannt"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Time:Unbekannt"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "?Rolle im Gruppenchat:<b>Rolle:</b>"
-
-#, fuzzy
 #~ msgid "Credentials"
 #~ msgstr "Oauth2 Zugangsdaten"
 
@@ -11421,9 +11470,6 @@ msgstr "Plugin-Manager"
 #~ msgid "Choose _Key..."
 #~ msgstr "_Schlüssel wählen …"
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "G_PG Schlüsselverwaltung verwenden"
-
 # TODO: GPG/PGP unification in original strings needed
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
@@ -11578,18 +11624,6 @@ msgstr "Plugin-Manager"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML-Direkteingabe</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filter:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML-Direkteingabe</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Senden"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML-Konsole für %s"
 
@@ -12122,9 +12156,6 @@ msgstr "Plugin-Manager"
 #~ "Sie möchten einen Multi-User-Chat beginnen.\n"
 #~ "Bitte wählen Sie die Kontakte, die Sie einladen möchten"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESession</b>-Informationen)"
-
 #~ msgid "Export"
 #~ msgstr "Export"
 
@@ -12162,13 +12193,6 @@ msgstr "Plugin-Manager"
 #~ msgid "<i>(example: stunserver.org)</i>"
 #~ msgstr "<i>(Beispiel: stunserver.org)</i>"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>jemand@irgendwo.de</b> möchte Sie als Kontakt zu seiner Kontaktliste "
-#~ "<b>hinzufügen</b>."
-
 #~ msgid "More"
 #~ msgstr "Mehr"
 
@@ -12198,13 +12222,6 @@ msgstr "Plugin-Manager"
 #~ "SHA1-Fingerprint dieses Zertifikates:\n"
 #~ "%s"
 
-#~ msgid ""
-#~ "<b>Message was corrected. Last message was:</b>\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "<b>Nachricht wurde korrigiert. Letzte Nachricht war:</b>\n"
-#~ "  %s"
-
 #~ msgid "Please fill in the data of the contact you want to add in account %s"
 #~ msgstr ""
 #~ "Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s "
@@ -12256,9 +12273,6 @@ msgstr "Plugin-Manager"
 #~ msgid "_Browse"
 #~ msgstr "_Durchsuchen"
 
-#~ msgid "_Execute Command"
-#~ msgstr "_Befehl ausführen"
-
 #~ msgid "Session Management"
 #~ msgstr "Sitzungsverwaltung"
 
diff --git a/po/el.po b/po/el.po
index bcd11cfe5..e4492ad74 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:46+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team:  <>\n"
@@ -34,20 +34,20 @@ msgstr ""
 msgid "Error."
 msgstr "Σφάλμα:"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -93,72 +93,72 @@ msgstr "Χρόνος"
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Mέγεθος: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "You"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Άνοιγμα αρχείου μενού"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Παραλήπτης: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -166,35 +166,35 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Αποστολή"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Περιγραφή: %s"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Το Gajim δεν έχει πρόσβαση σε αυτό το αρχείο"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Δεν είναι δυνατή η αντικατάσταση του υπάρχοντος αρχείου \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -202,93 +202,93 @@ msgstr ""
 "Ένα αρχείο με αυτό το όνομα υπάρχει ήδη και δε μπορείτε να το "
 "αντικαταστήσετε."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Δεν είναι δυνατή η εγγραφή στον κατάλογο \"%s\""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Δε μπορείτε να δημιουργήσετε αρχεία σε αυτό τον κατάλογο."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Αποθήκευση αρχείου ως..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Αρχείο: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Περιγραφή: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Όνομα προφίλ:"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/δεπτ)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Μη έγκυρο αρχείο"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Αρχείο:"
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Παύση"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
@@ -448,47 +448,69 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Διαθέσιμος"
+
 #: gajim/features_window.py:101
 #, fuzzy
 msgid "Feature"
 msgstr "Χαρακτηριστικά διακομιστή"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Η εικόνα δεν είναι δυνατό να αποθηκευτεί στη μορφή %(type)s. Να αποθηκευτεί "
 "ως %(new_filename)s;"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Αποθήκευση εικόνας ως..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Έχει"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Πελάτης: Άγνωστος"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?Λειτ. Σύστημα: Άγνωστο"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Πελάτης: Άγνωστος"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Εφαρμογές</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -497,7 +519,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -506,39 +528,49 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Απόγευμα"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Διαχείριση προφίλ μεσολαβητή"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -583,13 +615,13 @@ msgid "_New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
@@ -602,7 +634,7 @@ msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφ�
 msgid "Send Single _Message…"
 msgstr "Αποστολή ενός _μηνύματος"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 #, fuzzy
 msgid "Send Cus_tom Status"
@@ -623,25 +655,25 @@ msgstr "Μεταφορές"
 msgid "_Modify Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Μετονομασία"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 #, fuzzy
 msgid "Remo_ve"
@@ -657,205 +689,225 @@ msgstr "Πληροφορίες επαφής"
 msgid "Send File..."
 msgstr "Αποστολή _αρχείου"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Επαφές"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Προσθήκη στη λίστα επαφών"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Ιστορικό"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Διαχείριση σελιδοδεικτών"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Αλλαγή _θέματος"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Ρύθμιση _δωματίου"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Περιγραφή: %s"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Αλλαγή _ψευδώνυμου"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Φωνή"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Προκαθορισμένα μηνύματα:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Εκτέλεση εντολής..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Προσθήκη επαφής..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "αρχείο"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "Εύρεση _υπηρεσιών"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Αποστολή μονού _μηνύματος"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Προχωρημένοι"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Προτιμήσεις"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Εξυπηρετητής"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Διαχειριστής"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Αποστολή μηνύματος διακομιστή"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Ορισμός MOTD"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Ενημέρωση MOTD"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Διαγραφή MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Λογαριασμοί"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "μήνυμα"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Φατσούλες:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Θέμα"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -863,7 +915,7 @@ msgstr ""
 "Θέλετε να καθαρίσετε τη βάση δεδομένων; (ΑΝΤΕΝΔΕΙΚΝΥΤΑΙ ΙΣΧΥΡΑ ΕΑΝ ΤΟ GAJIM "
 "ΤΡΕΧΕΙ)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -878,103 +930,103 @@ msgstr ""
 "\n"
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Εξαγωγή ιστορικού..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr ""
 "Θέλετε σίγουρα να διαγράψετε το αρχείο καταγραφής της επιλεγμένης επαφής;"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 msgstr[1] "Θέλετε σίγουρα να διαγράψετε τα επιλεγμένα μηνύματα;"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Όνομα προφίλ:"
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 #, fuzzy
 msgid "Information received"
 msgstr "Περισσότερες πληροφορίες..."
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Όνομα προφίλ:"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 #, fuzzy
 msgid "Information NOT published"
 msgstr "Δεν ήταν δυνατή η εκτέλεση του \"%s\""
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -992,10 +1044,10 @@ msgstr "Όνομα εικονιδίου"
 msgid "JID: <i>%s</i>"
 msgstr "ID συστήματος:"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Γενικά"
@@ -1094,38 +1146,38 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 #, fuzzy
 msgid "User ID:"
 msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1133,50 +1185,50 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Έκδοση GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Έκδοση PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Δημιουργοί:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "Τέλος, θα θέλαμε να ευχαριστήσουμε όλους τους διαχειριστές πακέτων."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -1184,12 +1236,12 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg@hellug.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1198,13 +1250,13 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Σύνδεση"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1215,512 +1267,535 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Αίτηση εγγραφής"
+
+#: gajim/dialogs.py:2284
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Δημιουργία νέου προφίλ"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Μη έγκυρο JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Όνομα"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Σύνδεση"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Προσθήκη νέας επαφής"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Νέο μονό μήνυμα"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Η επαφή άλλαξε κατάσταση"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Από %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Απόγευμα"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Φιλτράρισμα:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Είσοδος δεδομένων XML</b>"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Αποστολή"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Πάγωσε"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "_Τροποποίηση"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Αφαίρεση"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 #, fuzzy
 msgid "Modify"
 msgstr "_Τροποποίηση"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 #, fuzzy
 msgid "Groups"
 msgstr "Ομάδα"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Προσθήκη _επαφής"
 msgstr[1] "Προσθήκη _επαφής"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Αφαιρεί μια επαφή από τη λίστα επαφών"
 msgstr[1] "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Προτιμήσεις"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Προσθήκη νέας εγγραφής στο μενού"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Σφάλμα:"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "backdrops.list"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr ""
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Εικονίδια δράσεων"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Εικόνες"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Επιλογή εικόνας"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Όλα τα αρχεία"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "για το λογαριασμό %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1744,336 +1819,373 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Μεταφορές αρχείων"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr ""
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Περιγραφή: %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 #, fuzzy
 msgid "and authenticated"
 msgstr "Χρήση πιστοποίησης"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Χρήση πιστοποίησης"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 #, fuzzy
 msgid "Conversation with "
 msgstr "Ιστορικό συζητήσεων"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Σύνδεση"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Συσχέτιση: "
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Μεταφορές αρχείων"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Μεταφορές αρχείων"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2081,7 +2193,7 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2090,107 +2202,107 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Mέγεθος: "
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Αποδοχή"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 #, fuzzy
 msgid "Error opening file"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 #, fuzzy
 msgid "Groupchats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2198,11 +2310,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2210,39 +2322,39 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Ακύρωση μεταφοράς αρχείου"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -2251,19 +2363,19 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -2272,12 +2384,12 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2286,72 +2398,72 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 #, fuzzy
 msgid "Rename Group"
 msgstr "Ιδιοκτήτης / Ομάδα"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Διαγραφή ομάδας"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2360,12 +2472,12 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2374,16 +2486,16 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2392,7 +2504,7 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -2400,40 +2512,40 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -2441,206 +2553,206 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Μη έγκυρο αρχείο"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 msgstr[1] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Αποστολή %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr ""
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr ""
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Εύρεση _υπηρεσιών..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Σε όλους τους χρήστες"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 #, fuzzy
 msgid "In_vite to"
 msgstr "Αδυναμία φόρτωσης"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Μετονομασία αρχείων"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Επεξεργασία _ομάδων"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "Α_λλαγή μηνύματος κατάστασης"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Συνδέεται"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "%d μη αναγνωσμένο μήνυμα"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2649,7 +2761,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2657,7 +2769,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2805,16 +2917,16 @@ msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
@@ -2846,10 +2958,20 @@ msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Εκτύπωση όλων των σελίδων"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Είσοδος και έξοδος μόνο"
 
+#: gajim/config.py:1949
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Εκτύπωση όλων των σελίδων"
+
 #: gajim/config.py:2015
 #, fuzzy
 msgid "New Group Chat"
@@ -2924,12 +3046,12 @@ msgstr "Μη έγκυρη εγγραφή"
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -3028,92 +3150,117 @@ msgstr "Επισήμανση "
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Κανένας"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Μέλος"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Διαχειριστής"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Ιδιοκτήτης"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 #, fuzzy
 msgid "Connected"
 msgstr "Σύνδεση"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 #, fuzzy
 msgid "Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Λήψη"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Αποστολή"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+#, fuzzy
+msgid "?transfer status:Paused"
+msgstr "Εκτύπωση όλων των σελίδων"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Κατάσταση: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Εκτύπωση όλων των σελίδων"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
@@ -3162,127 +3309,131 @@ msgstr "(Κενή)"
 msgid "Hidden"
 msgstr "Μυστικό"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Ιστορικό κουβέντας με τον %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Ιστορικό συζητήσεων"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 #, fuzzy
 msgid "Disk Error"
 msgstr "Σφάλμα:"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "Ο/Η %(nick)s είναι τώρα %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 #, fuzzy
 msgid "Error"
 msgstr "Σφάλμα:"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Διαχείριση σελιδοδεικτών"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Εμφάνιση _λίστας επαφών"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Σε κάθε _μήνυμα"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Εξυπηρετητής:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Χαρακτηριστικά διακομιστή"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3447,7 +3598,7 @@ msgstr "_Εγγραφή"
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -3456,53 +3607,59 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "_Έξοδος"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Α_ναζήτηση για:"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Λείπει ένα \"%s\" από το URL του λεξικού και δεν είναι WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Μη έγκυρο JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3514,32 +3671,37 @@ msgstr[1] "Χθες"
 msgid "Write a message.."
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Ομαδικές συζητήσεις"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3550,275 +3712,280 @@ msgstr ""
 "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
 "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Ιστορικό</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Δεν είστε στη λίστα μελών."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 #, fuzzy
 msgid "Subscription request"
 msgstr "Αίτηση εγγραφής"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Παρατηρητές"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Εγγραφή"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Εσφαλμένη φράση πρόσβασης"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Εσφαλμένη φράση πρόσβασης"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Επιλέξτε το κλειδί OpenPGP σας"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
+
+#: gajim/gui_interface.py:1196
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 #, fuzzy
 msgid "Username Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3826,7 +3993,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3836,15 +4003,15 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3859,13 +4026,13 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3874,34 +4041,34 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3909,42 +4076,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 #, fuzzy
 msgid "default"
 msgstr "Προεπιλογή"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Εσφαλμένη φράση πρόσβασης"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
@@ -4017,6 +4184,11 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4054,7 +4226,7 @@ msgid "The form is not filled correctly."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Αφανής"
 
@@ -4182,6 +4354,56 @@ msgid ""
 "Link-local messaging might not work properly."
 msgstr ""
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Θέμα"
@@ -4208,7 +4430,16 @@ msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντ
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Συνενωμένοι λογαριασμοί"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr ""
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
@@ -4231,6 +4462,11 @@ msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Αφαίρεση"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4425,55 +4661,69 @@ msgstr "Αλλαγή κωδικού πρόσβασης"
 msgid "Login Options"
 msgstr "Φατσούλες:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα ή το άρθρωμα της python "
 "λείπει"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "εμφανίζει βοήθεια για μια συγκεκριμένη εντολή"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "εντολή"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "εμφάνιση βοήθειας στην εντολή"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Εμφανίζει όλες τις επαφές στη λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια "
 "ξεχωριστή γραμμή"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "λογαριασμός"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "εμφάνιση μόνο των επαφών του συγκεκριμένου λογαριασμού"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Εμφανίζει τη λίστα των καταχωρημένων λογαριασμών"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "κατάσταση"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4482,11 +4732,17 @@ msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "μήνυμα"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "μήνυμα κατάστασης"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4495,17 +4751,22 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Π_ροτεραιότητα:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4515,7 +4776,7 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4527,31 +4788,31 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "περιεχόμενα μηνύματος"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο "
 "κλειδί"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4562,167 +4823,167 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "θέμα"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "θέμα μηνύματος"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για ένα λογαριασμό"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Όνομα λογαριασμού"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "αρχείο"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "εάν οριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του "
 "έχει προσδιοριστεί"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "κλειδί"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του "
 "λογαριασμού"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 #, fuzzy
 msgid "Sends custom XML"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 #, fuzzy
 msgid "XML to send"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Αλλαγή κατάστασης"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4731,31 +4992,31 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4766,7 +5027,7 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4775,7 +5036,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4949,11 +5210,6 @@ msgstr "Τέλος εβδομάδας"
 msgid "Weekend!"
 msgstr "Σαββατοκύριακο!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "για το λογαριασμό %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4979,52 +5235,52 @@ msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Νέο μονό μήνυμα από %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Νέο προσωπικό μήνυμα από το δωμάτιο %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "Ο %(nick)s άλλαξε κατάσταση"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Σύνδεση %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Αποσύνδεση %(nickname)s"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 #, fuzzy
 msgid "Not in roster"
 msgstr "Εκτέλεση στο Τερματικό"
@@ -5782,75 +6038,73 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Ειδική παράκαμψη για το jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5859,21 +6113,21 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5881,159 +6135,169 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Χρήση πιστοποίησης"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Χρήση πιστοποίησης"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Χρήση πιστοποίησης"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Τρώω"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Ταινία"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Δουλειά"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Έξω"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Είμαι διαθέσιμος."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Είμαι ελεύθερος για κουβέντα."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Δεν είμαι διαθέσιμος."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Μην ενοχλείτε."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Γεια χαρά!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -6042,27 +6306,27 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "πράσινο"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "ζεστό"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "θαλασσί"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Προς"
@@ -6145,37 +6409,52 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr "%d μη αναγνωσμένο μήνυμα"
 
+#: gajim/common/httpupload.py:137
+#, fuzzy
+msgid "File is empty"
+msgstr "Διαδρομή αρχείου"
+
+#: gajim/common/httpupload.py:140
+#, fuzzy
+msgid "File does not exist"
+msgstr "Δεν υπάρχει τέτοια συζήτηση."
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Αποστολή %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Το Gajim τώρα θα κλείσει"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
@@ -6185,11 +6464,11 @@ msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να ε
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "κυανό"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
@@ -6199,236 +6478,236 @@ msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Επανασύνδεση χειροκίνητα."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Επαφές"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -7380,257 +7659,282 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Απαιτείται η διεύθυνση του διακομιστή."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "_Διαθέσιμος"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?κατάσταση επαφής: Άγνωστη"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Καμία"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Προς"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Από"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Τίποτα"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Κανένας"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "γράφει ένα μήνυμα..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Αποστολή μηνύματος"
 msgstr[1] "Αποστολή μηνύματος"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "Από %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "Από %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Από %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
 "%s"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "μήνυμα"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
@@ -7662,44 +7966,44 @@ msgid ""
 "Try reading %(url)s"
 msgstr "Ο δίαυλος του session δεν είναι διαθέσιμος."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7950,6 +8254,11 @@ msgstr "_Απαγόρευση πρόσβασης"
 msgid "_Add to Roster"
 msgstr "_Προσθήκη στη λίστα επαφών"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Εκτέλεση εντολής..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8265,11 +8574,11 @@ msgstr "Περί"
 msgid "Con_tinue"
 msgstr "_Συνέχεια"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Παύση"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Άκυρο"
@@ -8278,33 +8587,33 @@ msgstr "_Άκυρο"
 msgid "_Open Containing Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Μεταφορές αρχείων"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "λίστα μεταφορών αρχείων"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Εκκα_θάριση"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Αφαιρεί τις ολοκληρωμένες, ακυρωμένες και αποτυχημένες μεταφορές από τη λίστα"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Αφαίρεση της μεταφοράς αρχείου από τη λίστα."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8312,33 +8621,38 @@ msgstr ""
 "Αυτή η ενέργεια αφαιρεί μια μεταφορά αρχείου από τη λίστα. Αν η μεταφορά "
 "είναι ενεργή, τότε πρώτα διακόπτεται και μετά αφαιρείται"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Ακυρώνει την επιλεγμένη μεταφορά αρχείου και διαγράφει το ημιτελές αρχείο"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Ακύρωση μεταφοράς αρχείου"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχείου"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Αποστολή & κλείσιμο"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Αποκρύπτει το παράθυρο"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Ειδοποίηση όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 #, fuzzy
 msgid "Shows a list of file transfers between you and others"
 msgstr "Δείχνει τη λίστα μεταφορών αρχείων μεταξύ εσάς και άλλων"
@@ -8348,7 +8662,7 @@ msgid "Register to"
 msgstr "Εγγραφή σε"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Εντάξει"
 
@@ -8382,22 +8696,22 @@ msgstr "_Γραμματοσειρά:"
 msgid "Clear formatting"
 msgstr "Πληροφορίες επαφής"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Γεγονός"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Γεγονότα"
@@ -8460,7 +8774,7 @@ msgstr "<b>Ιστορικό</b>"
 msgid "<b>#</b>"
 msgstr "<b>Ιστορικό</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9243,10 +9557,6 @@ msgstr "_Άνοιγμα..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Επεξεργασία προχωρημένων ρυθμίσεων</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Προχωρημένοι"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Έναρξη _συζήτησης"
@@ -9505,7 +9815,7 @@ msgid "_Open Email Composer"
 msgstr "_Άνοιγμα προγράμματος αλληλογραφίας"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Έναρξη συζήτησης"
 
@@ -9551,6 +9861,10 @@ msgstr "Προτιμήσεις"
 msgid "Default:"
 msgstr "Προεπιλογή"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Προσθήκη νέας επαφής"
@@ -9576,6 +9890,16 @@ msgstr "_Όνομα χρήστη:"
 msgid "_Group:"
 msgstr "_Ομάδα:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Όνομα χρήστη"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9608,6 +9932,11 @@ msgid ""
 "to add a contact from this protocol."
 msgstr ""
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "Α_λλαγή μηνύματος κατάστασης"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -9848,10 +10177,10 @@ msgstr "_Εκτέλεση εντολής..."
 msgid "_Verify"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Λογαριασμοί"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Περιγραφή</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9878,11 +10207,6 @@ msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 msgid "Show Transports"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Μεταφορές αρχείων"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9958,35 +10282,25 @@ msgstr ""
 msgid "Pr_int status:"
 msgstr "Εμφάνιση κατάστασης:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Περιγραφή"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Αναφορά σφάλματος"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Πιθανότατα δεν είναι κρίσιμο, αλλά πρέπει να αναφερθεί στους προγραμματιστές "
 "σε κάθε περίπτωση."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Αίτηση εγγραφής"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Αναφορά σφάλματος"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Άρνηση"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
@@ -9995,17 +10309,12 @@ msgstr ""
 "Αρνηθείτε εξουσιοδότηση σε μια επαφή ώστε να μη μπορεί να γνωρίζει πότε "
 "είστε συνδεδεμένος"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Ενέργειες"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 #, fuzzy
 msgid "Au_thorize"
 msgstr "Αμερική/Πορτ-Ο-Πρενς"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 #, fuzzy
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
@@ -10025,27 +10334,32 @@ msgstr ""
 msgid "Presets"
 msgstr "_Παρουσία"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
 msgid "MUC server"
 msgstr "Παρατηρητές"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Αδυναμία φόρτωσης"
@@ -10170,11 +10484,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Απόγευμα"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10342,6 +10651,16 @@ msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμ�
 msgid "Mute Sounds"
 msgstr "Σίγαση ήχων"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Προτιμήσεις"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Έξοδος"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Προς:"
@@ -10750,14 +11069,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Ένα πρόγραμμα για το Jabber"
@@ -10882,6 +11193,23 @@ msgid "Plugin manager"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "για το λογαριασμό %s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Περιγραφή"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
+
+#~ msgid "_Actions"
+#~ msgstr "_Ενέργειες"
+
+#, fuzzy
 #~ msgid "Start Chat..."
 #~ msgstr "_Έναρξη συζήτησης"
 
@@ -11066,14 +11394,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
-#, fuzzy
-#~ msgid "File is empty"
-#~ msgstr "Διαδρομή αρχείου"
-
-#, fuzzy
-#~ msgid "File does not exist"
-#~ msgstr "Δεν υπάρχει τέτοια συζήτηση."
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -11082,61 +11402,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ "άβαταρ, έχει τώρα ή έχει αλλά είναι πεπαλαιωμένη."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "_Διαθέσιμος"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "Εκτύπωση όλων των σελίδων"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?κατάσταση επαφής: Άγνωστη"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Καμία"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Τίποτα"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Κανένας"
-
-#, fuzzy
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "Κανένας"
-
-#, fuzzy
-#~ msgid "?print_status:All"
-#~ msgstr "Εκτύπωση όλων των σελίδων"
-
-#, fuzzy
-#~ msgid "?print_status:None"
-#~ msgstr "Εκτύπωση όλων των σελίδων"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Διαθέσιμος"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "λογαριασμός"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "κατάσταση"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "μήνυμα"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Π_ροτεραιότητα:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "Από"
 
@@ -11149,28 +11414,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "κωδικός πρόσβασης"
 
 #, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Ομαδικές συζητήσεις"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Λήψη"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Αποστολή"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Πελάτης: Άγνωστος"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?Λειτ. Σύστημα: Άγνωστο"
-
-#, fuzzy
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Πελάτης: Άγνωστος"
-
-#, fuzzy
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr ""
 #~ "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
@@ -11477,17 +11720,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Είσοδος δεδομένων XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Φιλτράρισμα:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Είσοδος δεδομένων XML</b>"
-
-#~ msgid "Send"
-#~ msgstr "Αποστολή"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML Κονσόλα για %s"
 
@@ -11711,10 +11943,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "έχει την προσοχή του στην κουβέντα"
 
 #, fuzzy
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Περιγραφή</b>"
-
-#, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Όνομα επαφής"
 
@@ -12410,10 +12638,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgstr "Αυτός ο λογαριασμός έχει ήδη στηθεί στο Gajim."
 
 #, fuzzy
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP: "
-
-#, fuzzy
 #~ msgid "Idle"
 #~ msgstr "Id"
 
@@ -12447,12 +12671,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
 #~ "προσώπου (π.χ. /%s χοροπηδάει)."
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
-
 #~ msgid "<b>Please fill in the data for your new account</b>"
 #~ msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 5578564fd..3f3923087 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-11-20 20:49+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -25,20 +25,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Error."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Really send file?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "If you send a file to %s, he/she will know your real Jabber ID."
@@ -94,70 +94,70 @@ msgstr "Time"
 msgid "Progress"
 msgstr "Progress"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Size: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "You"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Open Containing Folder"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "File transfer stopped"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -165,34 +165,34 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Choose File to Send..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Send"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Description: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim cannot access this file"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -200,93 +200,93 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "What do you want to do?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Save File as..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Sending profile..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "File Transfer Error"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "File: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Name: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Sender: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pause"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Continue"
 
@@ -444,43 +444,64 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Requires python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Available"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Feature"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Error reading file:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Error parsing file:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Save Image as..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Have "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Unknown"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Unknown"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "Unknown"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -489,7 +510,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -498,13 +519,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -512,27 +533,37 @@ msgid ""
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "You are waiting contact's answer about your subscription request"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "There is no pending subscription request."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "All files"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Cleaning"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Manage Proxy Profiles"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -575,13 +606,13 @@ msgid "_New Group Chat"
 msgstr "_New Group Chat"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Not in Roster"
 
@@ -594,7 +625,7 @@ msgstr "I would like to add you to my roster"
 msgid "Send Single _Message…"
 msgstr "Send Single _Message"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Send Cus_tom Status"
@@ -612,25 +643,25 @@ msgstr "_Manage Transport"
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Rename"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Unblock"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Block"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Remo_ve"
@@ -644,203 +675,223 @@ msgstr "_Information"
 msgid "Send File..."
 msgstr "Send _File..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Invite _Contacts"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Add to Roster"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_History"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Manage Room"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Change _Subject..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Configure _Room..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Destroy Room"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Change _Nickname..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Bookmark this room"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voice"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Preset messages:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimise on close"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Execute Command"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Disconnect"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Add Contact..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "file"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Discover Services"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "_Send Single Message..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Advanced"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferences"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synchronise"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Console"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Admin"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Send Server Message..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Set MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Update MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Delete MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "No account available"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Accounts"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "message"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Emoticons:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Date"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Nickname"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Message"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Subject"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -848,7 +899,7 @@ msgstr ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -863,99 +914,99 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Database Error"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Exporting History Logs..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Do you really want to delete the selected message?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Do you really want to delete the logs of the selected contact?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "The service could not be found"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Cancel confirmation"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Do you really want to delete the selected message?"
 msgstr[1] "Do you really want to delete the selected messages?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Retrieving profile..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Personal Information"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Information received"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Without a connection you can not publish your contact information."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Sending profile..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -973,10 +1024,10 @@ msgstr "Contact name: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "General"
@@ -1064,36 +1115,36 @@ msgstr "Please fill in the data of the contact you want to add in account %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "You cannot add yourself to your roster."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "User ID:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Error while adding service. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1101,60 +1152,60 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "A GTK+ Jabber client"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ Version:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK Version:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Current Developers:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Past Developers:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Last but not least, we would like to thank all the package maintainers."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Dictionary for lang %s not available"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1167,12 +1218,12 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Insecure connection"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1183,496 +1234,520 @@ msgstr ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Yes, I really want to connect insecurely"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Do _not ask me again"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "The nickname has not allowed characters."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Subscription Request"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Subscription request for account %(account)s from %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Join Group Chat"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Invalid room"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Invalid Nickname"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Please create a clean new theme with your desired name."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Wrong uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "This is not a group chat"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Name"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "You cannot synchronise with an account unless it is connected."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Continued conversation"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "New Group Chat"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Add New Contact"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "New Message"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "New Single Message"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Single Message"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Form %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "It is not possible to send a message to %s, this JID is not valid."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Cleaning"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filter:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML Input</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Send"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Sad"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Modify"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "Remo_ve"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Add"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Modify"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Delete"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Groups"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s suggested me to add you in my roster."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "_Add contact"
 msgstr[1] "_Add contact"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Removes contact from roster"
 msgstr[1] "Removes contact from roster"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Preferences"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Service returned an error."
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Error"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Privacy List"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %(order)s, action: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "You must enter a name to create a privacy list."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "You are invited to a groupchat"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Do you want to accept the invitation?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Images"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Choose Image"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "All files"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "for account %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1696,67 +1771,95 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL certificate error"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "File Transfers"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E encryption disabled"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s is now known as %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Metacontacts storage not supported by your server"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Invalid group chat Jabber ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Destroying %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1765,250 +1868,260 @@ msgstr ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "You may also enter an alternate venue:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "and authenticated"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "and NOT authenticated"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s encryption is active %(authenticated)s."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s has set the subject to %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Room now shows unavailable member"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "room now does not show unavailable members"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Room logging is now enabled"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Room logging is now disabled"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Room is now fully-anonymous"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s has been removed from the room (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Room logging is enabled"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "The server has assigned or modified your roomnick"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s has been removed from the room (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "affiliation changed"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "system shutdown"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Affiliation of %(nick)s has been set to %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Role of %(nick)s has been set to %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "If you close this window, you will be disconnected from this group chat."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "File Transfers"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "File Transfers"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Show a list of formattings"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "This contact does not support file transfer."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Session negotiation cancelled"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Session WILL NOT be logged"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "This session is encrypted"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " and WILL be logged"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " and WILL NOT be logged"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2016,16 +2129,16 @@ msgstr ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E encryption disabled"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2033,7 +2146,7 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2042,7 +2155,7 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2051,95 +2164,95 @@ msgstr ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "File Transfers"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr "Size"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Accept"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Join"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Remote contact stopped transfer"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Error opening file"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Groupchats"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transports"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Authorisation has been sent"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Now \"%s\" will know your status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Authorisation has been removed"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG is not usable"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2147,11 +2260,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2159,38 +2272,38 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Really quit Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Always close Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancel file transfer"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2198,16 +2311,16 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2215,11 +2328,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2228,11 +2341,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "You are about to block a contact. Are you sure you want to continue?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2241,56 +2354,56 @@ msgstr ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Also remove all contacts in this group from your roster"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2299,11 +2412,11 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2312,15 +2425,15 @@ msgstr ""
 "By removing this contact you also by default remove authorisation resulting "
 "in him or her always seeing you as offline."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2329,14 +2442,14 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "You are about to send a custom status. Are you sure you want to continue?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2345,24 +2458,24 @@ msgstr ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "No account available"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "You must create an account before you can chat with other contacts."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2371,13 +2484,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2387,194 +2500,194 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Do you want to send this file to %s:"
 msgstr[1] "Do you want to send these files to %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s to %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publish Tune"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Configure Services..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "To all users"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "To all online users"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_vite to"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Edit _Groups"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Remove"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_History"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "History Manager"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Change Status Message"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Use t_rayicon (aka. notification area icon)"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Show only in _roster"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Advanced Configuration Editor"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Room Configuration"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Show All Pending _Events"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Database Error"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "What do you want to do?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connecting"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Forward unread messages"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2583,7 +2696,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2591,7 +2704,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2737,16 +2850,16 @@ msgstr "Emoticons disabled"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Password Required"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Save password"
 
@@ -2778,10 +2891,18 @@ msgstr "Remove account _only from Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "All"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "None"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "New Group Chat"
@@ -2847,11 +2968,11 @@ msgstr "Invalid entry"
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "This certificate is already in file %s, so it's not added again."
@@ -2955,90 +3076,113 @@ msgstr "Group Chat Message Highlight"
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "None"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Member"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Owner"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [blocked]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [minimised]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Connected"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Download"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Upload"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Type: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Transferred: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Not started"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Stopped"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Completed"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Paused"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Stalled"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Transferring"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Paused"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Away"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Busy"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Not Available"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Offline"
 
@@ -3087,125 +3231,129 @@ msgstr "(None)"
 msgid "Hidden"
 msgstr "Hidden"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Conversation History with %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Conversation History"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Error"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Change Status Message"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Manage Bookmarks"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "in _roster"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Show _Roster"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Unable to load idle module"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Invisibility not supported"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Hostname:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Servers Features"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Server replied: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3363,7 +3511,7 @@ msgstr "_Subscribe"
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3371,51 +3519,57 @@ msgstr ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Quote"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Invalid JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3427,30 +3581,35 @@ msgstr[1] "Yesterday"
 msgid "Write a message.."
 msgstr "New Private Message"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "You are going to close several tabs"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Do you really want to close them all?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Group Chats"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Messages"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3462,108 +3621,108 @@ msgstr ""
 "occupant.\n"
 "Please specify another nickname below:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Always use this nickname when there is a conflict"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request on account %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "A Password is required to join the room %s. Please type it."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Font</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "You are banned from group chat %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Group chat %s does not exist."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Group chat %s does not exist."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Group chat creation is restricted."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Unable to join group chat"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Your registered nickname must be used in group chat %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "You are not in the members list in groupchat %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Subscription request"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observers"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3572,31 +3731,31 @@ msgstr ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3605,36 +3764,36 @@ msgstr ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Wrong Passphrase"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Wrong Passphrase"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certificate has expired"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3643,77 +3802,82 @@ msgstr ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL certificate error"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "File Transfers"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Choose File to Send..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Unable to decrypt message"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3721,21 +3885,21 @@ msgstr ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Error verifying SSL certificate"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3746,7 +3910,7 @@ msgstr ""
 "%(error)s\n"
 "Do you still want to connect to this server?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3759,15 +3923,15 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignore this error for this certificate."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3788,7 +3952,7 @@ msgstr ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3796,7 +3960,7 @@ msgstr ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3805,16 +3969,16 @@ msgstr ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "This is not a group chat"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Emoticons disabled"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3822,7 +3986,7 @@ msgstr ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3831,11 +3995,11 @@ msgstr ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3843,41 +4007,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "default"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG key expired"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Your GPG key has expied, you will be connected to %s without OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
@@ -3949,6 +4113,11 @@ msgstr "- messages will be logged"
 msgid "- messages will not be logged"
 msgstr "- messages will not be logged"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3980,7 +4149,7 @@ msgstr "Invalid room"
 msgid "The form is not filled correctly."
 msgstr "The nickname has not allowed characters."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4109,6 +4278,57 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Could not start local service"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Could not load image"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Service returned an error."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Could not load image"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "E2E encryption enabled"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "A connection is not available"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Theme"
@@ -4134,7 +4354,17 @@ msgstr "You cannot delete your current theme"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Merged accounts"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Use G_PG Agent"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Be right back."
 
@@ -4156,6 +4386,11 @@ msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Remove"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4349,62 +4584,82 @@ msgstr "Change Password"
 msgid "Login Options"
 msgstr "_Emoticons:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus is not present on this machine or python module is missing"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "command"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "show help on command"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "account"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "status message"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4412,16 +4667,21 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Changes the priority of account or accounts"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "priority"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "priority you want to give to the account"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4429,7 +4689,7 @@ msgstr ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4439,29 +4699,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "message contents"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4471,119 +4731,119 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "subject"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "message subject"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sends new message to a groupchat you've joined."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID of the room that will receive the message"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "file"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "File path"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "key"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML to send"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4592,17 +4852,17 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Change status"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Nickname to use"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4611,19 +4871,19 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Check if Gajim is running"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Shows or hides the ipython window"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4632,15 +4892,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "It seems Gajim is not running. So you can't use gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4649,16 +4909,16 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4669,7 +4929,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4678,7 +4938,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4852,11 +5112,6 @@ msgstr "End of week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP account %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4880,52 +5135,52 @@ msgstr "Room has been destroyed"
 msgid "You can join this room instead: %s"
 msgstr "You can join this room instead: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unknown SSL error: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Messaged by %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "New Message from %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Not in roster"
 
@@ -5737,22 +5992,18 @@ msgstr "Enable ESessions encryption for this account."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Should Gajim automatically start an encrypted session when possible?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5760,48 +6011,48 @@ msgid ""
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Space separated list of SSL errors to ignore."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Whitespace sent after inactivity"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sent after inactivity"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5810,11 +6061,11 @@ msgstr ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5822,21 +6073,21 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Answer to receipt requests"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5844,12 +6095,12 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s wants to send you a file."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5857,150 +6108,160 @@ msgstr ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anonymous authentication"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anon_ymous authentication"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anon_ymous authentication"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr "How many lines to request to server when entering a groupchat."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr "How many minutes back to request logs when a entering a groupchat."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Back soon"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Movie"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "I'm working."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Phone"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Out"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "I'm available."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Bye!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6008,27 +6269,27 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "human"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "To"
@@ -6107,37 +6368,50 @@ msgstr "All unread messages have been forwarded."
 msgid "Forward unread message then disconnect"
 msgstr "Forward unread messages"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "File is empty"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "File does not exist"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "creating logs database"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Send %s to %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is a file but it should be a directory"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
@@ -6147,11 +6421,11 @@ msgstr "%s is a directory but should be a file"
 msgid "Error: cannot open %s for reading"
 msgstr "Error: cannot open %s for reading"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -6160,188 +6434,188 @@ msgstr "migrating logs database to indices"
 msgid "%s is not a valid loglevel"
 msgstr "%s is not a valid loglevel"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Unable to decode issuer public key"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Certificate signature failure"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "CRL signature failure"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Certificate is not yet valid"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Certificate has expired"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL is not yet valid"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL has expired"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Self signed certificate"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Self signed certificate in certificate chain"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Unable to get local issuer certificate"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Unable to verify the first certificate"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Certificate chain too long"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certificate revoked"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Invalid CA certificate"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Path length constraint exceeded"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Unsupported certificate purpose"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certificate not trusted"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certificate rejected"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Key usage does not include certificate signing"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s answered wrongly to register request: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Could not connect to \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Could not connect to \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server replied: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Connection to proxy failed"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to account %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connection with account %s has been lost. Retry connecting."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6350,7 +6624,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6359,38 +6633,38 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Sent contact: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Sent contacts:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
@@ -7261,255 +7535,280 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Invalid character in hostname."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Server address required."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Invalid character in username."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Busy"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "Paused"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Connecting"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "A_way"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Offline"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Unknown"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Has errors"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "None"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "To"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "From"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Both"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "None"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "None"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderators"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Participants"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Participant"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Visitors"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Visitor"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "is composing a message..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message pending"
 msgstr[1] "%d messages pending"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " from room %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " from user %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " from %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d event pending"
 msgstr[1] "%d events pending"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "I would like to add you to my contact list."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Timeout loading image"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Image is too big"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL is not yet valid"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Timeout loading image"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "message"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
@@ -7546,43 +7845,43 @@ msgstr ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Your message could not be sent."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7822,6 +8121,11 @@ msgstr "_Ban"
 msgid "_Add to Roster"
 msgstr "_Add to Roster"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Execute Command"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8103,11 +8407,11 @@ msgstr "About"
 msgid "Con_tinue"
 msgstr "_Continue"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pause"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Cancel"
@@ -8116,31 +8420,31 @@ msgstr "_Cancel"
 msgid "_Open Containing Folder"
 msgstr "_Open Containing Folder"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "file transfers list"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "A list of active, completed and stopped file transfers"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Clean _up"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Removes completed, cancelled and failed file transfers from the list"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Remove file transfer from the list."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8148,32 +8452,37 @@ msgstr ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Cancels the selected file transfer and removes incomplete file"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Cancel file transfer"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Cancels the selected file transfer"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Send & Close"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Hides the window"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notify me when a file transfer is complete"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Show a pop-up notification when a file transfer is complete "
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Shows a list of file transfers between you and others"
 
@@ -8182,7 +8491,7 @@ msgid "Register to"
 msgstr "Register to"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8213,21 +8522,21 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Clear formating"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Show a list of emoticons (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Choose File to Send..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Show a list of emoticons (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Event"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Events"
@@ -8290,7 +8599,7 @@ msgstr "<b>Font</b>"
 msgid "<b>#</b>"
 msgstr "<b>Font</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9043,10 +9352,6 @@ msgstr "_Open..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Advanced Configuration Editor</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Advanced"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Start _Chat"
@@ -9288,7 +9593,7 @@ msgid "_Open Email Composer"
 msgstr "_Open E-mail Composer"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Start Chat"
 
@@ -9333,6 +9638,10 @@ msgstr "Preferences"
 msgid "Default:"
 msgstr "Default"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Add New Contact"
@@ -9358,6 +9667,16 @@ msgstr "_Nickname:"
 msgid "_Group:"
 msgstr "_Group:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "User ID:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Nickname"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9396,6 +9715,11 @@ msgstr ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Change Status Message"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Mood:</b>"
@@ -9620,10 +9944,9 @@ msgstr "_Execute Command..."
 msgid "_Verify"
 msgstr "_Verify"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Accounts"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b> info)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9650,11 +9973,6 @@ msgstr "Show Only _Active Contacts"
 msgid "Show Transports"
 msgstr "Show Trans_ports"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "File Transfers"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9728,35 +10046,26 @@ msgstr "Minimise on Auto Join"
 msgid "Pr_int status:"
 msgstr "Print status:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Description"
-
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Report Bug"
-msgstr "_Report Bug"
-
-#: gajim/data/gui/exception_dialog.ui:89
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "A programming error has been detected.\n"
 "It probably is not fatal, but should be reported\n"
 "to the developers nonetheless."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Subscription Request"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Report Bug"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Deny"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9764,16 +10073,11 @@ msgstr ""
 "Deny authorisation from contact so he or she cannot know when you're "
 "connected"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Actions"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_thorise"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Authorise contact so he or she can know when you're connected"
 
@@ -9791,11 +10095,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Presence"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Invite Friends!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9804,15 +10108,20 @@ msgstr ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Please select a MUC server."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC server"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_vite"
 
@@ -9930,11 +10239,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Cleaning"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10096,6 +10400,16 @@ msgstr "Show All Pending _Events"
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferences"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Quit"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "To:"
@@ -10501,14 +10815,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Room Configuration"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM Client"
@@ -10633,6 +10939,31 @@ msgid "Plugin manager"
 msgstr "Registration failed"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP account %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Description"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Actions"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Requires python-dbus."
 
@@ -10832,12 +11163,6 @@ msgstr "Registration failed"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Hide the chat buttons"
 
-#~ msgid "File is empty"
-#~ msgstr "File is empty"
-
-#~ msgid "File does not exist"
-#~ msgstr "File does not exist"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10867,58 +11192,6 @@ msgstr "Registration failed"
 #~ msgstr "Requires python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "Paused"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "Paused"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Unknown"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Has errors"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "None"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "None"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "None"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "None"
-
-#~ msgid "?print_status:All"
-#~ msgstr "All"
-
-#~ msgid "?print_status:None"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Available"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "account"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "message"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "priority"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "room"
 
@@ -10930,30 +11203,6 @@ msgstr "Registration failed"
 #~ msgid "?CLI:password"
 #~ msgstr "password"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Group Chats"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Download"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Upload"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "Paused"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Unknown"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Unknown"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "Unknown"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Use D-Bus and Notification-Daemon to show notifications"
 
@@ -11160,9 +11409,6 @@ msgstr "Registration failed"
 #~ msgid "Choose _Key..."
 #~ msgstr "Choose _Key..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Use G_PG Agent"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11288,18 +11534,6 @@ msgstr "Registration failed"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML Input</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filter:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML Input</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Send"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML Console for %s"
 
@@ -11699,9 +11933,6 @@ msgstr "Registration failed"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Invite contacts to the conversation (Ctrl+G)"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESession</b> info)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Contact name"
@@ -11714,13 +11945,6 @@ msgstr "Registration failed"
 #~ msgid "All Chat Histories"
 #~ msgstr "Old stories"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-
 #~ msgid "More"
 #~ msgstr "More"
 
@@ -12654,9 +12878,6 @@ msgstr "Registration failed"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
@@ -12706,14 +12927,6 @@ msgstr "Registration failed"
 #~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 #~ "third person. (e.g. /%(command)s explodes.)"
 
-#, fuzzy
-#~ msgid "Encryption enabled"
-#~ msgstr "E2E encryption enabled"
-
-#, fuzzy
-#~ msgid "Encryption disabled"
-#~ msgstr "E2E encryption disabled"
-
 #~ msgid ""
 #~ "If checked, Gajim will sort contacts in roster window and groupchats by "
 #~ "their status and not by the shown name"
diff --git a/po/eo.po b/po/eo.po
index 287b29024..292b0ee1b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:48+0200\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -27,20 +27,20 @@ msgstr ""
 msgid "Error."
 msgstr "Eraro de Avahi"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -86,71 +86,71 @@ msgstr "Tempo"
 msgid "Progress"
 msgstr "Progreso"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosiernomo: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Longo: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Vi"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Konservita kiel: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Dosiertransmeto plenumitas"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Malfermi enhavantan dosierujon"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Dosiera transmeto nuligitas"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Konekto kun punkto neestableblas."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Ricevanto: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -158,128 +158,128 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Elektu dosieron por sendi..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Sendi"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Priskribo: %s"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim ne povas atingi tiun dosieron"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Dosiero kun tiu nomo jam ekzistas kaj vi ne havas permeson reskribi ĝin."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Kion vi volas fari?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Konservi dosieron kiel..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Dosiero: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Priskribo: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s volas sendi al vi dosieron:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Publicas vizitkarton..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Dosiertransmeta eraro"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Malkorekta dosiero"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Dosiero: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Nomo: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Sendanto: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Paŭzo"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Daŭrigi"
 
@@ -439,46 +439,68 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Enrete"
+
 #: gajim/features_window.py:101
 #, fuzzy
 msgid "Feature"
 msgstr "Servilaj trajtoj"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Eraro dum legado de dosiero:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Eraro dum dosieranalizo:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Bildo nekonserveblas en %(type)s formato. Ĉu konservu kiel %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Konservi bildon kiel..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Havas "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Nekonata"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Nekonata"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Nekonata"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programoj</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -487,7 +509,7 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -495,39 +517,49 @@ msgid ""
 msgstr ""
 "Vi interesiĝas pri kontakta ĉeesta informo, sed li/ŝi ne interesiĝas pri via"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Vi kaj la kontakto interesiĝas unu pri alia ĉeesta informo"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Vi kaj la kontakto interesiĝas unu pri alia ĉeesta informo"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Vespero"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Administri prokurservilajn agordojn"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -572,13 +604,13 @@ msgid "_New Group Chat"
 msgstr "Nova babilejo"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Mankas en kontaktlisto"
 
@@ -591,7 +623,7 @@ msgstr "Mi volus aldoni vin en mian kontaktliston"
 msgid "Send Single _Message…"
 msgstr "Sendi unuopan _mesaĝon"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 #, fuzzy
 msgid "Send Cus_tom Status"
@@ -612,25 +644,25 @@ msgstr "Transportiloj"
 msgid "_Modify Transport"
 msgstr "Montri Trans_portilojn"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Renomigi"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 #, fuzzy
 msgid "Remo_ve"
@@ -646,211 +678,231 @@ msgstr "Kontakta informo"
 msgid "Send File..."
 msgstr "Sendi _dosieron"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kontaktoj"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Aldoni al kontaktlisto"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Kontakta informo"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historio"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Aranĝi legosignojn"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Ŝanĝi _temon"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Administri _babilejon"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Priskribo: %s"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Ŝanĝi kaŝ_nomon"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Starigi legosignon por tiu babilejo"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voĉo"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Antaŭpreparitaj mesaĝoj:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Plenumi komandon..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Kontakto malkonektita"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Aldoni kontakton..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "dosiero"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Serĉi servojn"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Sendi unuopan _mesaĝon..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Krome"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Agordo"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Servilo"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML-konzolo"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Estro"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Sendi servilan mesaĝon"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Enigi tagmesaĝon"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Renovigi tagmesaĝon"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Forigi tagmesaĝon"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Neniu konto disponeblas"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Kontoj"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "mesaĝo"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Mienoj:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Ne povas trovi datumbazon de protokoloj"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Dato"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Kaŝnomo"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Temo"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Ĉu vi volas malplenigi la datumbazon? (EGE MALREKOMENDITA SE GAJIM AKTIVAS)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -865,98 +917,98 @@ msgstr ""
 "\n"
 "Se vi alklakos JES, bonvolu atendi..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Eksportas protokolojn..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s je %(time)s diris: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Ĉu vi vere volas forigi protokolojn de la elektita kontakto?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Neniu servo estas trovita"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Kontakta informo"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 msgstr[1] "Ĉu vi efektive volas forigi la elektitajn mesaĝojn?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Tio ĉi estas neinversigebla ago."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Obtenas vizitkarton..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontakta informo"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: JJJJ-MM-TT"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informo estas ricevita"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Senkonekte vi ne povas publikigi vian kontaktan informon."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Publicas vizitkarton..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informo NE publicitis"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -972,10 +1024,10 @@ msgstr "Kontaktnomo: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Ĝenerala"
@@ -1067,37 +1119,37 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "eraro dum aldonado de servo %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1105,59 +1157,59 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "GTK+bazita jabber-kliento"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Versio de GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Versio de PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Nunaj programistoj:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Ĝisnunaj programistoj:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "Fine ne malpli ol aliajn ni dankas ĉiujn pakaĵvartistojn."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1168,13 +1220,13 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konekto"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1183,504 +1235,528 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne plu demandi"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Mendo de abono"
+
+#: gajim/dialogs.py:2284
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Demando pri abono por konto %s de %s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Eniri babilejen"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Malkorekta rikordo"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Nova mesaĝo"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Malprava uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Tio ne estas babilejo"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nomo"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Servilo"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Konekto"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Nova babilejo"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Aldoni novan kontakton"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nova unuobla mesaĝo"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Mi estas %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Vespero"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtrilo:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML enigo</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Sendi"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Malrapidas"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "_Korekti"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Forigi"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Aldoni"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 #, fuzzy
 msgid "Modify"
 msgstr "_Korekti"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Forigi"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Aldoni _kontakton"
 msgstr[1] "Aldoni _kontakton"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Forigas kontakton el kontaktlisto"
 msgstr[1] "Forigas kontakton el kontaktlisto"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Agordo"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr ""
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Eraro de Avahi"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber-ID:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Privata listo"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordnumero: %s, ago: %s, tipo: %s, valoro: %s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Bildoj"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elektu bildon"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Ĉiuj dosieroj"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "por konto %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1704,334 +1780,372 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Dosieraj transmetoj"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Ĉifrado malebligata"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s nomiĝas %s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Vi ne plu ĉeestas en babilejo \"%s\" aŭ \"%s\" foriris."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Priskribo: %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historio de interparoloj"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konekto"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Aliĝo de %(nick)s nun estas malpermesa: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Aliĝo de %(nick)s estas malpermesita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aparteneco:"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se vi fermos tiun fenestron, vi senkonektiĝos de tiu ĉi babilejo."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Dosieraj transmetoj"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Dosieraj transmetoj"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2039,7 +2153,7 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2048,106 +2162,106 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Longo: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Akcepti"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Aliĝi"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 #, fuzzy
 msgid "Error opening file"
 msgstr "Eraro dum legado de dosiero:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 #, fuzzy
 msgid "Groupchats"
 msgstr "Babilejoj"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transportiloj"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Permeso estas sendita"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" akceptas tiun peton vi povos koni lian aŭ ŝian staton."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Permeso estas forigita"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2155,11 +2269,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2167,55 +2281,55 @@ msgstr ""
 "Ŝanĝo de via stato per nevidebla okazigos diskonektadon de tiuj babilejoj. "
 "Ĉu vi certas ke vi volas iĝi nevidebla?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Nuligi dosiertransmeton"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "Mesaĝoj disponeblos por legi ĝin poste nur se vi ŝaltis historion."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2223,11 +2337,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2236,68 +2350,68 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ĉu vi volas forigi la grupon %s de la kontaktlisto?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Forigi ankaŭ ĉiujn kontaktojn de la grupo el via kontaktlisto"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2306,12 +2420,12 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2320,15 +2434,15 @@ msgstr ""
 "Forigante tiu ĉi konton vi defaŭlte ankaŭ forigas permeson pro kio li aŭ ŝi "
 "ĉiam vidos vin senkonekta."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Permesi al tiu ĉi konto koni mian staton post forigado"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2337,37 +2451,37 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2376,12 +2490,12 @@ msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2391,199 +2505,199 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s volas sendi al vi dosieron:"
 msgstr[1] "%s volas sendi al vi dosieron:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Sendi %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Igi %s kaj %s metakontaktoj"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publici"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "_Serĉi servojn..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viti al"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Aranĝi _Grupojn"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Forigi"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontakto malkonektita"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontakto malkonektita"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historio"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "Ŝanĝi stat_mesaĝon"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Uzi pletpiktogramon"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Montri nur en _kontaktlisto"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Detala agorda administrilo"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Agordo de babilejo"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Kion vi volas fari?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Konektas"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr " %d nelegita mesaĝo"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2592,7 +2706,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2600,7 +2714,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2747,16 +2861,16 @@ msgstr "Ĉifrado malebligata"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
@@ -2788,10 +2902,18 @@ msgstr "Forigi konton _nur el Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "Ĉiujn"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "Neniujn"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Nova babilejo"
@@ -2862,12 +2984,12 @@ msgstr "Malkorekta rikordo"
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2965,92 +3087,115 @@ msgstr "Emfazado de mesaĝoj en babilejo"
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de tiu ĉi babilejo"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Neniu"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administristo"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Mastro"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 #, fuzzy
 msgid "Connected"
 msgstr "Konekto"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Elŝuti"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Alŝuti"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Tipo: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Transmetitas: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Ne lanĉitas"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Haltis"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Plenumita"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Paŭzas"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Malrapidas"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Transdonas"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Stato: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Paŭzas"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Fora"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Okupata"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Nedisponebla"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Senkonekta"
 
@@ -3099,125 +3244,129 @@ msgstr "(Mankas)"
 msgid "Hidden"
 msgstr "Kaŝita"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historio de interparolo kun %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historio de interparoloj"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s nun estas %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Aranĝi legosignojn"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Montri _kontaktliston"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Kromaĵo ne subtenatas"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Servilnomo: "
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Servilaj trajtoj"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Konservita kiel: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3379,7 +3528,7 @@ msgstr "_Aboni"
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -3388,52 +3537,58 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "_Eliri"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Vortara URL ne enhavas \"%s\" kaj ĝi ne estas WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Malkorekta jabber-ID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3445,32 +3600,37 @@ msgstr[1] "Hieraŭ"
 msgid "Write a message.."
 msgstr "Nova privata mesaĝo"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Vi nekonektitas al la servilo"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Babilejoj"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Mesaĝoj"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3481,273 +3641,278 @@ msgstr ""
 "Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
 "Bonvolu specifi alian kaŝnomon jene:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Necesas pasvorto por aliĝi al la babilejo."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Sonoj</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Babileja kreado limigitas."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Vi devas uzi vian registritan kaŝnomon."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vi ne ĉeestas en membrolisto."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 #, fuzzy
 msgid "Subscription request"
 msgstr "Mendo de abono"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Rigardiloj"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Malaboni"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aŭ provu denove poste."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Malprava pasfrazo"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Malprava pasfrazo"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vi sukcese sendis %(filename)s al %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Elektu dosieron por sendi..."
+
+#: gajim/gui_interface.py:1196
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En ĉ_iu mesaĝo"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3755,7 +3920,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3765,15 +3930,15 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3788,46 +3953,46 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Tio ne estas babilejo"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Ĉifrado malebligata"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3835,42 +4000,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 #, fuzzy
 msgid "default"
 msgstr "Defaŭlte"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
@@ -3942,6 +4107,11 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3974,7 +4144,7 @@ msgstr "Malkorekta rikordo"
 msgid "The form is not filled correctly."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Nevidebla"
 
@@ -4105,6 +4275,56 @@ msgstr ""
 "%s\n"
 "Lig-loka komunikado ne povas funkcii korekte."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Ne povas lanĉi lokan servon"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ne povas alŝuti bildon"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Ne povas alŝuti bildon"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Ĉifrado ebligata"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Konekto mankas"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Etoso"
@@ -4131,7 +4351,16 @@ msgstr "Vi ne povas forigi aktivan etoson"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Unuigaj kontoj"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr ""
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
@@ -4152,6 +4381,11 @@ msgstr "Vi havas aktivan konversacion ĉe konto %s"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Forigi"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4346,51 +4580,65 @@ msgstr "Ŝanĝi pasvorton"
 msgid "Login Options"
 msgstr "Mienoj:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-BUS aŭ konforma pitona modulo mankas ĉe tiu ĉi komputilo."
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Montri helpon pri specifita komando"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "komando"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "montri helpon pri komando"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Antaŭigas fenestron kun la sekva atendanta evento"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Eligas liston de ĉiuj kontaktoj de kontaktlisto. Ĉiu kontakto aperas en "
 "separata lineo"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "konto"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "Montri kontaktojn nur de specifita konto"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Eligas liston de registritaj kontoj"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "stato"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4398,11 +4646,17 @@ msgid ""
 msgstr ""
 "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mesaĝo"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "statmesaĝo"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4411,17 +4665,22 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Priori_tato:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Mi volas registri novan konton"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4431,7 +4690,7 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4441,29 +4700,29 @@ msgstr ""
 "kaj konto estas fakultativaj. Se vi volas specifi nur konton sen OpenPGP-"
 "ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "mesaĝenhavo"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Se specifita, la mesaĝo estos ĉifrita per tiu ĉi publika ŝlosilo"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Se specifita, la mesaĝo estos sendita per tiu ĉi konto"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4473,119 +4732,119 @@ msgstr ""
 "kaj konto estas fakultativaj. Se vi volas specifi nur konton sen OpenPGP-"
 "ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "temo"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Ricevas detalan informon pri kontakto"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "dosiero"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "\"ŝlosilo\" estas nomo de parametro, \"valoro\" estas ĝia stato"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "ŝlosilo"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nomo de forigota parametro"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skribas la aktualan agordon de Gajim en la dosieron \".config\""
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Se specifita, kontakto estos prenata el kontaktlisto de tiu ĉi konto"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Donas nuntempan staton (la komuna se konto estas nespecifita)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Donas kvanton de nelegitaj mesaĝoj"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Sendi propran XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML por sendi"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4594,17 +4853,17 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4613,21 +4872,21 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4636,31 +4895,31 @@ msgstr ""
 "%s mankas en via kontaktlisto\n"
 "Bonvolu specifi konton por sendi la mesaĝon."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumentoj:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4671,7 +4930,7 @@ msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4680,7 +4939,7 @@ msgstr ""
 "Tro multe da argumentoj. \n"
 "Enigu \"%s help %s\" por plia informo"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4854,11 +5113,6 @@ msgstr "Fino de semajno"
 msgid "Weekend!"
 msgstr "Semajnofino!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "de konto %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4883,52 +5137,52 @@ msgstr "Permeso estas forigita"
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova unuopa mesaĝo de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privata mesaĝo de babilejo %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ŝanĝis staton"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s ensalutis"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s elsalutis"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Mankas en kontaktlisto"
 
@@ -5718,75 +5972,73 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5794,179 +6046,189 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s volas sendi dosieron al vi."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Uzi aŭtentokontrolon"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Uzi aŭtentokontrolon"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Uzi aŭtentokontrolon"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Manĝas"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Kino"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Laboras"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefonado"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Eliris"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -5974,27 +6236,27 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "verda"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "homa"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "mara"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Al"
@@ -6083,37 +6345,52 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr " %d nelegita mesaĝo"
 
+#: gajim/common/httpupload.py:137
+#, fuzzy
+msgid "File is empty"
+msgstr "Dosierindiko"
+
+#: gajim/common/httpupload.py:140
+#, fuzzy
+msgid "File does not exist"
+msgstr "Tiu babilejo ne ekzistas."
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "kreadas protokolan datumbazon"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "kreadas protokolan datumbazon"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Sendi %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s estas dosiero sed devas esti dosierujo"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim fermos tuj"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s estas dosierujo sed devas esti dosiero"
@@ -6123,11 +6400,11 @@ msgstr "%s estas dosierujo sed devas esti dosiero"
 msgid "Error: cannot open %s for reading"
 msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "blua"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "indeksigas protokolan datumbazon"
 
@@ -6136,238 +6413,238 @@ msgstr "indeksigas protokolan datumbazon"
 msgid "%s is not a valid loglevel"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Malkorekta salutnomo"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Rekonektu mane."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Konservita kiel: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konektado malsukcesis"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ne povas konekti al \"%s\""
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktoj"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
@@ -7303,256 +7580,281 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Malkorekta signo en servilnomo."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Necesas adreso de servilo."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Malkorekta signo en salutnomo."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Malkorekta signo en risurcnomo."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "Paŭzas"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Konektas"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Fora"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "Ne_videbla"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Nekonata"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Eraroj"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Neniu"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Al"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Nenion"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Neniu"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "tajpas mesaĝon..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Sendi mesaĝon"
 msgstr[1] "Sendi mesaĝon"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "Mi estas %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Ne povas alŝuti bildon"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrada informo por transportilo %s ne venis ĝustatempe"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "mesaĝo"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
@@ -7587,45 +7889,45 @@ msgstr ""
 "Seancbuso nedisponeblas.\n"
 "Provu legi http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Ne povas lanĉi lokan servon"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Neeblas aliĝi al pordo %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ne povas ŝanĝi staton de konto \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
@@ -7876,6 +8178,11 @@ msgstr "_Malpermesi"
 msgid "_Add to Roster"
 msgstr "_Aldoni al kontaktlisto"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Plenumi komandon..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8193,11 +8500,11 @@ msgstr "Pri si"
 msgid "Con_tinue"
 msgstr "_Daŭrigi"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Paŭzi"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Nuligi"
@@ -8206,33 +8513,33 @@ msgstr "_Nuligi"
 msgid "_Open Containing Folder"
 msgstr "_Malfermi enhavantan dosierujon"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Dosieraj transmetoj"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "dosiertransdonada listo"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Malplenigi"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Forigas plenumitajn, nuligitajn kaj malsukcesajn dosiertransmetojn el la "
 "listo"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Forigi dosiertransmeton el la listo."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8240,32 +8547,37 @@ msgstr ""
 "Tiu ĉi ago forigas unu dosiertransmeton de la listo. Se la transmeto estas "
 "aktiva, ĝin unue haltitas kaj poste forigitos."
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Nuligas la indikitan dosiertransmeton kaj forigas neplenan dosieron"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Nuligi dosiertransmeton"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Nuligas la indikitan dosiertransmeton"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Sendi kaj fermi"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Kaŝas la fenestron"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Avizi min kiam dosiero estas transdonita"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Montras liston de dosiertransmetojn inter vi kaj aliaj"
 
@@ -8274,7 +8586,7 @@ msgid "Register to"
 msgstr "Registri ĉe"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_O kej"
 
@@ -8308,22 +8620,22 @@ msgstr "_Tiparo:"
 msgid "Clear formatting"
 msgstr "Kontakta informo"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Klaku por enigi mienon (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Elektu dosieron por sendi..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Klaku por enigi mienon (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Evento"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Eventoj"
@@ -8386,7 +8698,7 @@ msgstr "<b>Sonoj</b>"
 msgid "<b>#</b>"
 msgstr "<b>Sonoj</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "n°"
 
@@ -9159,10 +9471,6 @@ msgstr "_Malfermi..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Detala agorda administrilo</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Krome"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Ekparoli"
@@ -9419,7 +9727,7 @@ msgid "_Open Email Composer"
 msgstr "_Malfermi retpoŝtredaktilon"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Ekparoli"
 
@@ -9465,6 +9773,10 @@ msgstr "Agordo"
 msgid "Default:"
 msgstr "Defaŭlte"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Aldoni novan kontakton"
@@ -9490,6 +9802,16 @@ msgstr "Kaŝ_nomo:"
 msgid "_Group:"
 msgstr "_Grupo:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Uzula ID:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Kaŝnomo"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9528,6 +9850,11 @@ msgstr ""
 "Vi devas konekti al la transportilo por ebligi aldonon\n"
 "de kontakto per tiu protokolo."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "Ŝanĝi stat_mesaĝon"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -9756,10 +10083,10 @@ msgstr "_Plenumi komandon..."
 msgid "_Verify"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Kontoj"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Priskribo</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9786,11 +10113,6 @@ msgstr "Montri _senkonektajn kontaktojn"
 msgid "Show Transports"
 msgstr "Montri Trans_portilojn"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Dosieraj transmetoj"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9864,49 +10186,34 @@ msgstr ""
 msgid "Pr_int status:"
 msgstr "Eligi statojn:"
 
-#: gajim/data/gui/exception_dialog.ui:7
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Exception"
-msgstr "Priskribo"
+msgid ""
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
+msgstr "Tio eble ne estas fatala, sed malgraŭ raportinda al la programistoj."
 
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:115
 #, fuzzy
 msgid "Report Bug"
 msgstr "_Raporti pri eraro"
 
-#: gajim/data/gui/exception_dialog.ui:89
-#, fuzzy
-msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
-msgstr "Tio eble ne estas fatala, sed malgraŭ raportinda al la programistoj."
-
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Mendo de abono"
-
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Rifuzi"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 "Rifuzi abonon de kontakto, do li aŭ ŝi ne povos scii kiam vi estas konektita"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Agoj"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Permesi"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Permesi al kontakto koni kiam vi konektas"
 
@@ -9924,27 +10231,32 @@ msgstr ""
 msgid "Presets"
 msgstr "_Ĉeesto"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
 msgid "MUC server"
 msgstr "Rigardiloj"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "In_viti al"
@@ -10066,11 +10378,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Vespero"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10237,6 +10544,16 @@ msgstr "Montri ĉiujn nelegitajn _eventojn"
 msgid "Mute Sounds"
 msgstr "Silentigi sonojn"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Agordo"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Eliri"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Al:"
@@ -10644,14 +10961,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Agordo de babilejo"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber-tujmesaĝilo"
@@ -10776,6 +11085,23 @@ msgid "Plugin manager"
 msgstr "Konektado malsukcesis"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "de konto %s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Priskribo"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "Mi petas vin permesi aldoni vin en mian kontaktliston."
+
+#~ msgid "_Actions"
+#~ msgstr "_Agoj"
+
+#, fuzzy
 #~ msgid "Start Chat..."
 #~ msgstr "_Ekparoli"
 
@@ -10957,14 +11283,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
 
-#, fuzzy
-#~ msgid "File is empty"
-#~ msgstr "Dosierindiko"
-
-#, fuzzy
-#~ msgid "File does not exist"
-#~ msgstr "Tiu babilejo ne ekzistas."
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10973,58 +11291,6 @@ msgstr "Konektado malsukcesis"
 #~ "ĝin lastatempe aŭ kies kaŝbildeto estis konservita tro antaŭlonge."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "Paŭzas"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "Paŭzas"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Nekonata"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Eraroj"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Neniu"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Nenion"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Neniu"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "Neniu"
-
-#~ msgid "?print_status:All"
-#~ msgstr "Ĉiujn"
-
-#~ msgid "?print_status:None"
-#~ msgstr "Neniujn"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Enrete"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "konto"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "stato"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "mesaĝo"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Priori_tato:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "babilejo"
 
@@ -11036,31 +11302,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "?CLI:password"
 #~ msgstr "pasvorto:"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Babilejoj"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Elŝuti"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Alŝuti"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "Paŭzas"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Nekonata"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Nekonata"
-
-#, fuzzy
-#~ msgid "?Time:Unknown"
-#~ msgstr "Nekonata"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Uzi D-Bus kaj avizadan demonon por montri avizojn"
 
@@ -11371,18 +11612,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML enigo</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtrilo:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML enigo</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Sendi"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML-konzolo por %s"
 
@@ -11606,10 +11835,6 @@ msgstr "Konektado malsukcesis"
 #~ msgstr "atentas al la komunikado"
 
 #, fuzzy
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Priskribo</b>"
-
-#, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Kontaktnomo"
 
@@ -12389,10 +12614,6 @@ msgstr "Konektado malsukcesis"
 #~ msgstr "Tiu ĉi konto jam ĉeestas en kontlisto de Gajim."
 
 #, fuzzy
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP: "
-
-#, fuzzy
 #~ msgid "Idle"
 #~ msgstr "Id"
 
@@ -12421,12 +12642,6 @@ msgstr "Konektado malsukcesis"
 #~ "Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s "
 #~ "eksplodas)."
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Ĉifrado ebligata"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Ĉifrado malebligata"
-
 #~ msgid "_Retype Password:"
 #~ msgstr "_Ripetu pasvorton:"
 
diff --git a/po/es.po b/po/es.po
index c18f55d20..f537975d6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:49+0200\n"
 "Last-Translator: Membris Khan <frank@giingo.org>\n"
 "Language-Team: none <>\n"
@@ -26,20 +26,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Error."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "¿Enviar fichero?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Si envías un archivo a %s, el/ella sabrá tu ID de Jabber real."
@@ -95,70 +95,70 @@ msgstr "Hora"
 msgid "Progress"
 msgstr "Progreso"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Nombre de archivo: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Tú"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Recipiente: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado en: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Transferencia de archivo finalizada"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Abrir carpeta contenedora"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivo cancelada"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "La conexión con el cliente no se pudo establecer."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipiente: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaje de error: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -166,34 +166,34 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Elige archivo a enviar..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Enviar"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Descripción: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim no puede acceder a este archivo"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "No se puede sobreescribir el archivo existente \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -201,93 +201,93 @@ msgstr ""
 "Un archivo con este nombre ya existe y no tienes permisos para "
 "sobreescribirlo"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "¿Qué quieres hacer?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "No se puede escribir en el directorio \"%s\""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "No tienes permisos para crear archivos en este directorio."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Guardar archivo como..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Archivo: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Enviando perfil..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Error en la transferencia del archivo"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Archivo no válido"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Archivo: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Nombre: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pausa"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -447,45 +447,66 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Requiere python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "En línea"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Característica"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Error analizando el archivo:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Extensión no soportada"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "La imagen no se pudo guardar en formato %(type)s. ¿Guardar como "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Guardar imagen como..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Tiene "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Desconocido"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Desconocido"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "Desconocida"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliación:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -494,7 +515,7 @@ msgstr ""
 "Este contacto está interesado en la información de tu presencia, pero tú no "
 "lo estás en la suya"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -503,14 +524,14 @@ msgstr ""
 "Estás interesado en la información de la presencia del contacto, pero él/"
 "ella no lo está en la tuya"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Tanto tú como el contacto estáis interesados en la información de la "
 "presencia del otro"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -519,28 +540,38 @@ msgstr ""
 "Tanto tú como el contacto estáis interesados en la información de la "
 "presencia del otro"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Estás esperando la respuesta del contacto acerca de tu petición de adición"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "No hay ninguna suscripción pendiente."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Todos los archivos"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Limpiando"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Gestionar perfiles del Proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -584,13 +615,13 @@ msgid "_New Group Chat"
 msgstr "_Nuevo grupo de charla"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "no está en el roster"
 
@@ -603,7 +634,7 @@ msgstr "Me gustaría añadirte a mi lista de contactos"
 msgid "Send Single _Message…"
 msgstr "Enviar mensaje"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Envía estado personalizado"
@@ -621,25 +652,25 @@ msgstr "_Gestionar transporte"
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "Renombrar"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "_Eliminar"
@@ -653,203 +684,223 @@ msgstr "_Información"
 msgid "Send File..."
 msgstr "Enviar _archivo"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Invitar _Contactos"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Añadir a la lista de contactos"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Información"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Histórico"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Gestionar salón"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Cambiar el _tema"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Configurar el salón"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Desmantelar salón"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Cambiar _Alias"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Añadir este salón a marcadores (Ctrl+B)"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Mensajes predefinidos:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimizar al cerrar"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Ejecutar comando"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Desconectar"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Añadir contacto..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "archivo"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Descubrir servicios"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "E_nviar mensaje..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferencias"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sincronizar"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Administrar"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Enviar mensaje de servidor"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Definir MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Actualizar MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Eliminar MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Cuenta no disponible"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "mensaje"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Emoticonos:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "No se puede encontrar la base de datos del historial"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Fecha"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Alias"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mensaje"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -857,7 +908,7 @@ msgstr ""
 "¿Quieres limpiar la base de datos? (TOTALMENTE DESACONSEJADO SI GAJIM ESTÁ "
 "EN EJECUCIÓN)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -872,99 +923,99 @@ msgstr ""
 "\n"
 "En caso de elegir SI, por favor, espera..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Error en la base de datos"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Exportando historial..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dijo: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "¿Realmente quieres eliminar el mensaje seleccionado?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "¿Realmente quieres eliminar el historial del contacto seleccionado?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "El servicio no fue encontrado"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Cancelar información"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "¿Realmente quieres eliminar el mensaje seleccionado?"
 msgstr[1] "¿Realmente quieres eliminar los mensajes seleccionados?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Esta es una operación irreversible"
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Recuperando perfil..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Información"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Información recibida"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Sin una conexión no puedes publicar tu información de contacto."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Enviando perfil..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Información NO publicada"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "falló la publicación de la vCard"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -982,10 +1033,10 @@ msgstr "Nombre del contacto : <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "General"
@@ -1074,36 +1125,36 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario no contiene un recurso."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "No puedes añadirte a tí mismo a tu roster."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Error añadiendo el servicio. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1111,61 +1162,61 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Versión de GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Versión de PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Desarrolladores actuales:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Desarrolladores anteriores:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Por último pero no menos importante, queremos agradecer a todos los "
 "mantenedores de paquetes."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Fran Alburquerque <frank@giingo.org>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "No está disponible el diccionario para el idioma %s"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1178,12 +1229,12 @@ msgstr ""
 "\n"
 "No se usará el resaltado de los errores de escritura"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Conexión no segura"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1194,496 +1245,519 @@ msgstr ""
 "Vas a enviar tu contraseña a través de una conexión no segura. Deberías "
 "instalar PyOpenSSL para prevenirlo. ¿Estás seguro de que quieres hacerlo?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sí, quiero conectarme de forma no segura"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_No preguntarme otra vez"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Alias no válido"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "El alias tiene caracteres no permitidos."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Petición de adición"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Petición de adición para la cuenta %(account)s de %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Entrar a un salón de chat"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Salón no válido"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Alias no válido"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Por favor crea un nuevo tema desde cero con el nombre deseado."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Uri incorrecta"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Esto no es un grupo de charla"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nombre"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Servidor"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Esta cuentano está conectada al servidor"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "No puedes sincronizar con una cuenta hasta que no te hayas conectado."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Conversación continuada"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Nuevo grupo de charla"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Añadir un contacto"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Nuevo correo-e"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Invitación a grupo de charla"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Contacto cambió su estado"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje en la cuenta %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Mensaje:"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "De %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "No es posible enviar un mensaje a %s, esta JID no es válida."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Limpiando"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtro:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Entrada de XML</b>"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Enviar"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Triste"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Modificar"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Eliminar"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%s</b> querría <b>%s</b> algunos contactos de tu roster."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Dirección"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Modificar"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Eliminar"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Grupos"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s me sugirió añadirte en mi roster."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Añadir un _Contacto"
 msgstr[1] "Añadir un _Contacto"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Elimina contacto del roster"
 msgstr[1] "Elimina contacto del roster"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Preferencias"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "El servicio devolvió un error"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Error."
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "ID de Jabber:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidad <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidad para %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Lista de privacidad"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orden: %(order)s, acción: %(action)s, tipo: %(type)s, valor: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orden: %(order)s, acción: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar una regla</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Añadir una regla</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listas de privacidad para %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Nombre de lista no válido"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Debes introducir un nombre para crear una una lista de privacidad."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Has sido invitado a un grupo de charla"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact te ha invitado a entrar en una discusión"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact te ha invitado al grupo de charla %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "¿Quieres aceptar la invitación?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Imágenes"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elegir Imagen"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Todos los archivos"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cuando %s esté:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Añadiendo notificación especial para %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "para la cuenta %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1707,69 +1781,97 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Error del certificado SSL"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Transferencias"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Encriptación desactivada"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s ahora es conocido como %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está ahora %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Ya no estás en el grupo de charla \"%(room)s\" o \"%(nick)s\" se ha ido."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Tu servidor no soporta almacenamiento de metacontactos"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "ID de Jabber no válida para el grupo de charla"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr ""
 "La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruyendo %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1778,252 +1880,262 @@ msgstr ""
 "Vas a destruir definitivamente este salón.\n"
 "Puedes especificar una razón abajo:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "También puedes introducir un lugar alternativo:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "y autentificado"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "y NO autenticado"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s cifrado %(status)s activo %(authenticated)s.\n"
 "Tu sesión %(logged)s guardada."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Conversación con "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Conversación continuada"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s ha cambiado el asunto a %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Cualquier ocupante puede ver tu JID completo"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "El salón ahora muestra miembros no disponibles"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "el salón ahora no muestra miembros no disponibles"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Ha sido activado el registro del salón"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "El salón está ahora deshabilitado"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "El salón es ahora no-anónimo"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "El salón es ahora semi-anónimo"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "El salón es ahora completamente anónimo"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s ha sido eliminado del salón (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Registro del salón activado"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Se ha creado un nuevo salón"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "El servidor ha asignado o modificado tu alias en el salón"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s ha sido eliminado del salón (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "cambió la afiliación"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "la configuración del salón cambió a sólo miembros"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "apagado del sistema"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** La afiliación de %(nick)s ha sido definida en %(affiliation)s por "
 "%(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** La afiliación de %(nick)s ha sido definida en %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** El rol de %(nick)s ha sido fijado a %(role)s por %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** El rol de %(nick)s ha sido fijado a %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "¿Estás seguro de querer abandonar el salón \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Si cierras esta ventana, serás desconectado de este grupo de charla."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Transferencias"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Transferencias"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Mostrar una lista de formateos"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Este contacto no soporta transferencia de archivos"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s del salón %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "La negociación de la sesión ha sido cancelada"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "La NO SERÁ registrada"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Esta sesión está cifrada"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " y SERÁ registrada"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " y NO SERÁ registrada"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2031,16 +2143,16 @@ msgstr ""
 "No se verificó la identidad del contacto remoto. Click en el botón del "
 "escudo para más detalles."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "Cifrado E2E desactivado"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2048,7 +2160,7 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2057,7 +2169,7 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2066,96 +2178,96 @@ msgstr ""
 "No se puede descifrar el mensaje de %s\n"
 "Es posible que haya sido manipulado."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s está ahora %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Transferencias"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Tamaño: "
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceptar"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Entrar"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "El contacto remoto detuvo la transferencia"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Error abriendo el archivo:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "La autorización ha sido enviada"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" acepta esta petición podrás saber su estado."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "La autorización ha sido eliminada"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG no es usable"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2163,11 +2275,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Estás participando en uno o más grupos de charla"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2175,38 +2287,38 @@ msgstr ""
 "Cambiando tu estado a invisible provocará tu desconexión de los grupos de "
 "charla. ¿Estás seguro de querer ser invisible?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "desincronizado"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "¿Cerrar realmente Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "¿Estás seguro de que quieres cerrar Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Siempre cerrar Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancela la transferencia"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2214,27 +2326,27 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado y el contacto está en tu roster."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Debes leerlos antes de eliminar este transporte."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "Ya no podrás enviar y recibir mensajes de contactos que usen este transporte"
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Los transportes serán eliminados"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2242,67 +2354,67 @@ msgid ""
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos de estos transportes: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Renombrar contacto"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduce un nuevo alias para el contacto %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduce un nuevo nombre para el grupo %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "¿Quieres eliminar el grupo %s del roster?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Eliminar del roster también a todos los contactos dentro del grupo"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Vas a eliminar a \"%(name)s\" (%(jid)s) de tu roster.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2312,11 +2424,11 @@ msgstr ""
 "también estás eliminando las autorizaciones resultantes y ellos siempre te "
 "verán desconectado."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "¿Quieres continuar?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2325,15 +2437,15 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Quiero que este contacto conozca mi estado después de la eliminación"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Los contactos serán eliminados de tu roster"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2343,37 +2455,37 @@ msgstr ""
 "también estás eliminando las autorizaciones resultantes y ellos siempre te "
 "verán desconectado."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debes crear una cuenta antes de poder conversar con otros contactos."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "No puedes entrar a un grupo de charla estando invisible"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2382,12 +2494,12 @@ msgstr ""
 "Tu servidor no soporta almacenar información de metacontactos. Luego toda la "
 "información referente no se guardará en la próxima reconexión."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2397,195 +2509,195 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de Jabber "
 "o cuentas de transportes."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "URI de archivo no válido:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Quieres enviar este archivo a %s:"
 msgstr[1] "Quieres enviar estos archivos a %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s a %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Hacer %s y %s metacontactos"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Hacer %s y %s metacontactos"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Hora de publicación"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Hora de publicación"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Configurar servicios..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maximizar todo"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Enviar mensaje a grupo"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "A todos los usuarios"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "A todos los usuarios en línea"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_vitar a"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Gestionar contactos"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar grupos"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Desconectar"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Histórico"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Entrar en nuevo grupo de charla"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Cambiar mensaje de estado"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar icono en el á_rea de notificación"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor avanzado de configurción"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuración del salón"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Mostrar todos los _eventos pendientes"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Error en la base de datos"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "¿Qué quieres hacer?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Reenviar mensajes sin leer"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2594,7 +2706,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2602,7 +2714,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2749,16 +2861,16 @@ msgstr "Emoticonos desactivados"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Guardar contraseña"
 
@@ -2790,10 +2902,18 @@ msgstr "Eliminar la _cuenta únicamente de Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "Todos"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Entrar y salir sólamente"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "Ninguno"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Nuevo grupo de charla"
@@ -2861,11 +2981,11 @@ msgstr "Entrada no válida"
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "El certificado ya está en el archivo"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Este certificado ya está en el archivo %s, no fue añadido de nuevo."
@@ -2969,90 +3089,113 @@ msgstr "Resaltado de mensaje de grupo de charla"
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de este grupo de conversación"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Ninguno"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Miembro"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrador"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Propietario"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [bloqueado]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [minimizado]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Conectado"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Descarga"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Subida"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Tipo: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "No iniciado"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Detenido"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Completado"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Pausada"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Atascado"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Estado: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Pausada"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Ausente"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "No disponible"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -3101,126 +3244,130 @@ msgstr "(Ninguno)"
 msgid "Hidden"
 msgstr "Oculta"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversaciones con %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Histórico de conversaciones"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Error de disco"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está ahora %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensaje de error: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 #, fuzzy
 msgid "Error"
 msgstr "Error."
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Cambiar mensaje de estado"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Gestionar marcadores"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "en _roster"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Mostrar _roster"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "No se puede cargar el módulo idle"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Invisibilidad no soportada"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "nuevo@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nuevo%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Nombre del host:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Características de los servidores"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "El servidor respondió: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3378,7 +3525,7 @@ msgstr "_Añadir"
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3386,51 +3533,57 @@ msgstr ""
 "El texto bajo esta línea es lo que ha sido dicho desde la última vez que "
 "prestaste atención a este salón de charla"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Cita"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Acciones para \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" en la URL del Diccionario y no está en WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" en la URL de la búsqueda web"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "_Abrir como enlace"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "ID de Jabber no válida"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3442,30 +3595,35 @@ msgstr[1] "Ayer"
 msgid "Write a message.."
 msgstr "Nuevo mensaje privado"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Estás a punto de cerrar varias pestañas"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "¿Realmente quieres cerrarlas todas?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Grupos de charla"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Conversaciones privadas"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Mensajes"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "No se pudo entrar al grupo de charla"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3477,108 +3635,108 @@ msgstr ""
 "ocupante.\n"
 "Especifica otro alias abajo:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Usar este alias siempre que exista un conflicto"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "¿Aceptas esta petición en la cuenta %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorización HTTP (%(method)s) para %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Se requiere una contraseña para entrar al salón %s. Introdúcela."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Fuente</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Estás baneado del grupo de charla %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "El grupo de charla %s no existe."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "El grupo de charla %s no existe."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "La creación de grupos de charla está restringida."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "No se pudo entrar al grupo de charla"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Tu alias registrado podría estar en uso en el grupo de charla %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "No estás en la lista de miembros del grupo de charla %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error mientras se enviaba %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Petición de adición"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3587,31 +3745,31 @@ msgstr ""
 "Siempre le verás desconectado.\n"
 "¿Le quieres eliminar de tu lista de contactos?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Eliminado"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3620,37 +3778,37 @@ msgstr ""
 "Configuraste Gajim para usar un agente GPG, pero no hay ningún agente en "
 "ejecución o el mismo devolvió una contraseña errónea.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Contraseña equivocada"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Contraseña equivocada"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "El certificado ha expirado"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 "Introduce la contraseña GPG para la clave %(keyid)s (cuenta %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3659,77 +3817,82 @@ msgstr ""
 "No se confía en la clave GPG usada para cifrar esta conversación. ¿Realmente "
 "quieres cifrar este mensaje?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Error del certificado SSL"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferencias"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Elige archivo a enviar..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "No se puede descifrar el mensaje"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Conflicto con nombre de usuario"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escribe un nuevo nombre de usuario para tu cuenta local"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Conflicto en el recurso"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3737,21 +3900,21 @@ msgstr ""
 "Ya estás conectado a esta cuenta con el mismo recurso. Por favor escribe uno "
 "nuevo"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quiere enviarte un archivo."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Petición de transferencia de archivo"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Error verificando el certificado SSL"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3762,7 +3925,7 @@ msgstr ""
 "%(error)s\n"
 "¿Aún quieres conectarte a este servidor?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3775,15 +3938,15 @@ msgstr ""
 "Huella SHA1 del certificado:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este error para este certificado"
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3804,7 +3967,7 @@ msgstr ""
 "\n"
 "¿Aún quieres conectar y actualizar la huella del certificado?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3812,7 +3975,7 @@ msgstr ""
 "Vas a enviar tu contraseña a través de una conexión no segura. Deberías "
 "instalar PyOpenSSL para prevenirlo. ¿Estás seguro de que quieres hacerlo?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3821,16 +3984,16 @@ msgstr ""
 "Vas a enviar tu contraseña en una conexión no cifrada- ¿Estás seguro de "
 "querer hacer esto?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Esto no es un grupo de charla"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Emoticonos desactivados"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3838,7 +4001,7 @@ msgstr ""
 "No se pudo encontrar tu tema de emoticonos configurado, los emoticonos han "
 "sido desactivados."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3847,11 +4010,11 @@ msgstr ""
 "No se pudo encontrar tu tema de emoticonos configurado, los emoticonos han "
 "sido desactivados."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Esto no es un grupo de charla"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3859,42 +4022,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "por defecto"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Introduce la contraseña GPG para la clave %(keyid)s (cuenta %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "La clave GPG expiró"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Tu clave GPG ha expirado, te conectarás a %s sin OpenPGP"
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Contraseña equivocada"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
@@ -3965,6 +4128,11 @@ msgstr "- los mensajes serán registrados"
 msgid "- messages will not be logged"
 msgstr "- los mensajes no serán registrados"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3997,7 +4165,7 @@ msgstr "Salón no válido"
 msgid "The form is not filled correctly."
 msgstr "El alias tiene caracteres no permitidos."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4132,6 +4300,57 @@ msgstr ""
 "%s\n"
 "La mensajería de enlace local podría no funcionar correctamente."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "No se pudo iniciar servicio local"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "No se pudo cargar la imagen"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "El servicio devolvió un error"
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "No se pudo cargar la imagen"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Encriptación activada"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "No hay disponible una conexión"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4157,7 +4376,17 @@ msgstr "No puedes eliminar el tema actual"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Cuentas combinadas"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Usar agente G_PG"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Vuelvo pronto"
 
@@ -4182,6 +4411,11 @@ msgstr ""
 "Todas las conversaciones y grupos de charla serán cerrados. ¿Deseas "
 "continuar?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Eliminar"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4375,51 +4609,65 @@ msgstr "Cambiar contraseña"
 msgid "Login Options"
 msgstr "_Emoticonos:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Muestra ayuda sobre un comando específico"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "comando"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Muestra u oculta la ventana de la lista de contactos"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Levanta una venana con el siguiente evento pendiente"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Muestra una lista de todos los contactos en el roster. Cada contacto aparece "
 "en una línea separada"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "cuenta"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "mostrar sólo contactos de la cuenta especificada"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Muestra una lista de cuentas registradas"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Cambia el estado de una o varias cuentas"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "estado"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4428,11 +4676,17 @@ msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mensaje"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "ensaje de estado"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4441,17 +4695,22 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Cambia el estado de una o varias cuentas"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Pr_ioridad:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4461,7 +4720,7 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4471,29 +4730,29 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "contenido del mensaje"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "si es especificado, el mensaje será cifrado usando su clave pública"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "si es especificado el mensaje será enviado a través de esta cuenta"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4503,123 +4762,123 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "tema del mensaje"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Envía un nuevo mensaje a un grupo de charla al que hayas entrado"
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "La JID del salón que recibirá el mensaje"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Obtener información detallada de un contacto"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de una cuenta"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Nombre de la cuenta"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "archivo"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "si es especificado el archivo será enviado usando esta cuenta"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'entrada' es el nombre de la preferencia, 'valor' es el valor a definir"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "entrada"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nombre de la preferencia a eliminar"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe el estado actual de la preferencias de Gajim al archivo de "
 "configuración"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Elimina contacto del roster"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "si es especificado, el contacto es obtenido de la lista de esta cuenta"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devuelve el estado actual (el global si no se especifica una cuenta)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devuelve el mensaje de estado actual (el global si no se especifica una "
 "cuenta)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Devuelve el número de mensajes sin leer"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4628,17 +4887,17 @@ msgstr ""
 "Cuenta a la que el xml será enviado; si no se especifica nada, el xml será "
 "enviado a todas las cuentas"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Cambiar estado"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Alias a usar"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4647,19 +4906,19 @@ msgstr ""
 "Cuenta a la que el xml será enviado; si no se especifica nada, el xml será "
 "enviado a todas las cuentas"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Comprueba si Gajim se encuentra en ejecución"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Muestra u oculta la ventana ipython"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4668,15 +4927,15 @@ msgstr ""
 "'%s' no está en tu lista de contactos.\n"
 "Por favor, especifica una cuenta para enviar el mensaje."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Parece que Gajim no está en ejecución. No puedes usar gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4685,16 +4944,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4705,7 +4964,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4714,7 +4973,7 @@ msgstr ""
 "Demasiados argumentos. \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4888,11 +5147,6 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "¡Fin de semana!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "Cuenta XMPP %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4917,52 +5171,52 @@ msgstr "El salón ha sido destruido"
 msgid "You can join this room instead: %s"
 msgstr "Puedes unirte a este salón en su lugar: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Error SSL desconocido: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuevo mensaje privado desde el grupo de charla %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Enviado por %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambió su estado"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se ha conectado"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se ha desconectado"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "No está en el roster"
 
@@ -5798,22 +6052,18 @@ msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "¿Gajim debería iniciar automáticamente una sesión cifrada cuando sea posible?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Lista ordenada (separada por espacios) de tipos de conexión para probar. "
-"Puede contener tls, ssl o plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5822,11 +6072,11 @@ msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Muestra un aviso antes de usar la librería SSL estándar"
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -5834,37 +6084,37 @@ msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espacios de errores ssl a ignorar."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Espacio en blanco enviado tras inactividad"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "Ping XMPP enviado tras inactividad"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5873,11 +6123,11 @@ msgstr ""
 "Cuántos segundos esperar una respuesta de paquetes de mantenimiento de "
 "actividad antes de  intentar reconectar."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5885,21 +6135,21 @@ msgstr ""
 "Si está marcado, Gajim usará tu IP y proxies definidos en la opción "
 "file_transfer_proxies para tu transferencia."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Contestar peticiones recibidas"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Enviar peticiones recibidas"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5907,12 +6157,12 @@ msgstr ""
 "Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
 "estás usando"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s quiere enviarte un archivo."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5920,148 +6170,158 @@ msgstr ""
 "Cuando se negocie una sesión cifrada, ¿Gajim debería asumir que quieres que "
 "tus mensajes sean registrados?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Autentificación anónima"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Autentificación a_nónima"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Autentificación a_nónima"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Comiendo"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Película"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Trabajando"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Teléfono"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Fuera"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Estoy fuera disfrutando la vida"
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Estoy disponible"
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Estoy libre para hablar"
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "No estoy disponible."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "No molestar."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "¡Adiós!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6070,27 +6330,27 @@ msgstr ""
 "palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
 "contiene tu alias."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "verde"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "human"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marino"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "A"
@@ -6169,37 +6429,50 @@ msgstr "Todos los mensajes sin leer han sido reenviados"
 msgid "Forward unread message then disconnect"
 msgstr "Reenviar mensajes sin leer"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "El archivo está vacío"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "El archivo no existe"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "creando base de datos de registros"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Enviar %s a %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s es un archivo pero podría ser un directorio"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s es un directorio pero podría ser un archivo"
@@ -6209,11 +6482,11 @@ msgstr "%s es un directorio pero podría ser un archivo"
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migrando la base de datos de registros a los índices"
 
@@ -6222,190 +6495,190 @@ msgstr "migrando la base de datos de registros a los índices"
 msgid "%s is not a valid loglevel"
 msgstr "%s no es un nivel de registro válido"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "No se puede obtener el certificado del emisor"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "No se puede obtener el certificado CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "No se puede descifrar la firma del certificado"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "No se puede descifrar la firma del CRL"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "No se puede decodificar la clave pública del emisor"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Fallo en la firma del certificado"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Fallo en la firma CRL"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "El certificado todavía no es válido"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "El certificado ha expirado"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "El CRL todavía no es válido"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "El CRL ha expirado"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Error de formato en el campo notBefore del certificado"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Error de formato en el campo notAfter del certificado"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Error de formato en el campo lastUpdate del CRL"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Error de formato en el campo nextUpdate del CRL"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Memoria llena"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Certificado autofirmado"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado autofirmado en la cadena del certificado"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "No se puede obtener el certificado del emisor local"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "No se puede verificar el primer certificado"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "La cadena del certificado es demasiado larga"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Certificado CA no válido"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "La longitud de la ruta excedió el límite"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Propósito de certificado no soportado"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "El certificado no es de confianza"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certificado rechazado"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "El emisor del asunto no coincide"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "La autoridad y el asunto de la clave identificadora no coinciden"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "La autoridad y el número de serie del emisor no coinciden"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "El uso de la clave no incluye la firma de certificados"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Falló la verificación de la aplicación"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Se ha perdido la conexión de la cuenta \"%s\""
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "El servidor %(name)s contestó incorrectamente a la petición de registro: "
 "%(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "El servidor %s provee un formulario de registro diferente"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "El servidor respondió: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Falló la conexión al proxy"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "No se puede conectar a la cuenta %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Se perdió la conexión con la cuenta %s. Reintentando la conexión."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "La autenticidad del certificado %s podría no ser válida."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6414,7 +6687,7 @@ msgstr ""
 "\n"
 "Error SSL: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6423,39 +6696,39 @@ msgstr ""
 "\n"
 "Error SSL desconocido: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "La autenticidad del certificado %s podría no ser válida."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprueba que tu nombre de usuario y contraseña sean correctos."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Contacto enviado: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Contactos enviados:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "No conseguido debido al estado invisible"
 
@@ -7325,255 +7598,280 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Se requiere la dirección del servidor."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "Pausada"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Desconocido"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Tiene errores"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Ninguna"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Ninguna"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Ninguno"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está escribiendo..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensaje pendiente"
 msgstr[1] "%d mensajes pendientes"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " del salón %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " del usuario %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " de %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Me gustaría añadirte a mi lista de contactos."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Expiró el tiempo para cargar la imagen"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "La imagen es demasiado grande"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "El CRL todavía no es válido"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Expiró el tiempo para cargar la imagen"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "La información de registro para el transporte %s no llegó a tiempo"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "mensaje"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
@@ -7608,43 +7906,43 @@ msgid ""
 "Try reading %(url)s"
 msgstr "El bus de la sesión no está disponible."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprueba si Avahi o Bonjour están instalados."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "No se pudo iniciar servicio local"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "No se pudo enlazar al puerto %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor, comprueba si avahi-daemon se encuentra en ejecución."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "No se pudo cambiar el estado de la cuenta \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Tu mensaje no pudo ser enviado."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "El contacto está desconectado. Tu mensaje no pudo ser enviado."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7889,6 +8187,11 @@ msgstr "_Banear"
 msgid "_Add to Roster"
 msgstr "_Añadir a la lista de contactos"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Ejecutar comando"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8171,11 +8474,11 @@ msgstr "Acerca de"
 msgid "Con_tinue"
 msgstr "_Continuar"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -8184,32 +8487,32 @@ msgstr "_Cancelar"
 msgid "_Open Containing Folder"
 msgstr "_Abrir carpeta contenedora"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Transferencias"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "lista de transferencias"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Una lista de transferencias activas, finalizadas y detenidas"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Limpiar"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Elimina de la lista las transferencias finalizadas, canceladas y fallidas"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias de la lista"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8217,35 +8520,40 @@ msgstr ""
 "Esta acción elimina transferencias de la lista. Si la transferencia está "
 "activa, es primero detenida y luego eliminada"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Cancela la transferencia de archivo seleccionada y elimina el archivo "
 "incompleto"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Cancela la transferencia"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Cancela la transferencia de archivo seleccionada"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Enviar y Cerrar"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Oculta la ventana"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificarme cuando una transferencia finalice"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Cuando una transferencia se completa, muestra una notificación emergente"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Muestra una lista de transferencias entre tú y otros"
 
@@ -8254,7 +8562,7 @@ msgid "Register to"
 msgstr "Registrar en"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8285,21 +8593,21 @@ msgstr "Fuente"
 msgid "Clear formatting"
 msgstr "Limpiar formato"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Mostrar una lista de emoticonos (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Elige archivo a enviar..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Mostrar una lista de emoticonos (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Evento"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Eventos"
@@ -8362,7 +8670,7 @@ msgstr "<b>Fuente</b>"
 msgid "<b>#</b>"
 msgstr "<b>Fuente</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr ""
 
@@ -9128,10 +9436,6 @@ msgstr "_Abrir..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor de configuración avanzada</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avanzado"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Iniciar conversación"
@@ -9372,7 +9676,7 @@ msgid "_Open Email Composer"
 msgstr "_Abrir el compositor de correo"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "Iniciar conversación"
 
@@ -9417,6 +9721,10 @@ msgstr "Preferencias"
 msgid "Default:"
 msgstr "Por defecto"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Añadir un contacto"
@@ -9442,6 +9750,16 @@ msgstr "_Alias:"
 msgid "_Group:"
 msgstr "_Grupo:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Identificador:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Alias"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9480,6 +9798,11 @@ msgstr ""
 "Debes estar conectado al transporte para poder\n"
 "añadir un contacto de este protocolo."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Cambiar mensaje de estado"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Estado de ánimo</b>"
@@ -9706,10 +10029,9 @@ msgstr "_Ejecutar comando..."
 msgid "_Verify"
 msgstr "_Verificar"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Cuentas"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "Información <b>ESession</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9736,11 +10058,6 @@ msgstr "Mostrar sólo contactos _activos"
 msgid "Show Transports"
 msgstr "Mostrar Trans_portes"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Transferencias"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9814,35 +10131,25 @@ msgstr "Minimizar al ingresar automáticamente"
 msgid "Pr_int status:"
 msgstr "Mostrar estado:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Descripción"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Informar de fallo"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Probablemente no es crítico, pero no obstante debe ser informado a los "
 "desarrolladores."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Petición de adición"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Informar de fallo"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9850,16 +10157,11 @@ msgstr ""
 "Denegar autorización al contacto para que no pueda saber cuándo estás "
 "conectado"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Acciones"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_torizar"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autorizar contacto para que pueda saber cuándo estás conectado"
 
@@ -9877,11 +10179,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Presencia"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "¡Invitar amigos!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9890,15 +10192,20 @@ msgstr ""
 "Vas a comenzar una conversación multiusuario.\n"
 "Selecciona los contactos a invitar"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Por favor selecciona un servidor MUC."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Servidor MUC"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_vitar"
 
@@ -10020,11 +10327,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Limpiando"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10186,6 +10488,16 @@ msgstr "Mostrar todos los _eventos pendientes"
 msgid "Mute Sounds"
 msgstr "Silenciar sonidos"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferencias"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Salir"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "A:"
@@ -10592,14 +10904,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configuración del salón"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
@@ -10724,6 +11028,31 @@ msgid "Plugin manager"
 msgstr "Falló el registro"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "Cuenta XMPP %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Descripción"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>alguien@algunsitio.com</b> quiere <b>añadir</b> algunos contactos a tu "
+#~ "roster."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Lista ordenada (separada por espacios) de tipos de conexión para probar. "
+#~ "Puede contener tls, ssl o plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Acciones"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Requiere python-dbus."
 
@@ -10927,12 +11256,6 @@ msgstr "Falló el registro"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Uso: /%s, oculta los botones de conversación."
 
-#~ msgid "File is empty"
-#~ msgstr "El archivo está vacío"
-
-#~ msgid "File does not exist"
-#~ msgstr "El archivo no existe"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10962,58 +11285,6 @@ msgstr "Falló el registro"
 #~ msgstr "Requiere python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "Pausada"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "Pausada"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Tiene errores"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Ninguna"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Ninguna"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Ninguno"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "Ninguno"
-
-#~ msgid "?print_status:All"
-#~ msgstr "Todos"
-
-#~ msgid "?print_status:None"
-#~ msgstr "Ninguno"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "En línea"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "cuenta"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "estado"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "mensaje"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Pr_ioridad:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "salón"
 
@@ -11025,30 +11296,6 @@ msgstr "Falló el registro"
 #~ msgid "?CLI:password"
 #~ msgstr "contraseña"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Grupos de charla"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Descarga"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Subida"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "Pausada"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "Desconocida"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Usar DBus y el demonio notificador para mostrar notificaciones"
 
@@ -11254,9 +11501,6 @@ msgstr "Falló el registro"
 #~ msgid "Choose _Key..."
 #~ msgstr "Elegir _clave..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Usar agente G_PG"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11388,17 +11632,6 @@ msgstr "Falló el registro"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Entrada de XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtro:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Entrada de XML</b>"
-
-#~ msgid "Send"
-#~ msgstr "Enviar"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Consola XML para %s"
 
@@ -11948,9 +12181,6 @@ msgstr "Falló el registro"
 #~ msgid "_Allow him/her to see my status"
 #~ msgstr "Permitirle ver mi estado"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "Información <b>ESession</b>"
-
 #, fuzzy
 #~ msgid "All Chat Histories"
 #~ msgstr "Historias viejas"
@@ -12001,13 +12231,6 @@ msgstr "Falló el registro"
 #~ msgstr ""
 #~ "Si está marcado, Gajim mostrará los ajustes de los contactos en el roster"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>alguien@algunsitio.com</b> quiere <b>añadir</b> algunos contactos a tu "
-#~ "roster."
-
 #~ msgid "_Group Chat"
 #~ msgstr "_Grupos de charla"
 
@@ -12711,9 +12934,6 @@ msgstr "Falló el registro"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compilation of gtkspell module from "
 #~ "Gajim sources."
@@ -12768,12 +12988,6 @@ msgstr "Falló el registro"
 #~ "Uso: /%s <acción>, envía una acción al grupo de charla actual. Usa la "
 #~ "tercera persona. (p.ej. /%s grita.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Encriptación activada"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Encriptación desactivada"
-
 #~ msgid "<b>Please fill in the data for your new account</b>"
 #~ msgstr "<b>Por favor, introduce los datos para tu nueva cuenta</b>"
 
@@ -13196,9 +13410,6 @@ msgstr "Falló el registro"
 #~ msgid "zh_CN"
 #~ msgstr "chino (China)"
 
-#~ msgid "User ID"
-#~ msgstr "Identificador:"
-
 #~ msgid "Invalid room or server name"
 #~ msgstr "Nombre de usuario no válido"
 
diff --git a/po/eu.po b/po/eu.po
index 6def7e57d..95fe93093 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:50+0200\n"
 "Last-Translator: Urtzi  <>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -28,20 +28,20 @@ msgstr ""
 msgid "Error."
 msgstr "Avahi error"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -87,72 +87,72 @@ msgstr "Denbora"
 msgid "Progress"
 msgstr "Prozesua"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaina: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Zu"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "%s gordea"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Fitxero transferentzia osatua"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Ireki Fitxeroaren Edukia"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Fitxero transferentzia ezeztatua"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Hartzailea: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Errore mezua: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -160,128 +160,128 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Bidali"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Deskribapena: %s"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim-ek ezin du fitxero honetan sartu."
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Izen honekin dagoeneko badago fitxerorik eta ez duzu baimenik gainarazteko."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Zer nahi duzu egitea?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Gorde Bezala..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Fitxeroa: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Deskribapena: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Profila bidaltzen..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Fitxero Baliogabea"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Fitxeroa:"
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Izena: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Etena"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Jarraitu"
 
@@ -441,46 +441,68 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Libre"
+
 #: gajim/features_window.py:101
 #, fuzzy
 msgid "Feature"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Errorea fitxeroa analizatzean:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Irudia ezin izan da %(type)s formatuan gorde. Gorde %(new_filename)s bezala?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Gorde Irudia Bezala..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "daukadanean"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Aurkitu gabea"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Aurkitu gabea"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Aurkitu gabea"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikazioak</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -489,7 +511,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -498,40 +520,50 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Zu eta kontaktua, bien egoera informazioetan interesatuta zaudete"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Zu eta kontaktua, bien egoera informazioetan interesatuta zaudete"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Arratsaldea"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Proxy Profila Moldatu"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -576,13 +608,13 @@ msgid "_New Group Chat"
 msgstr "Txat Taldea Berria"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
 
@@ -595,7 +627,7 @@ msgstr "Nire zerrendara nahi nizuke sartu"
 msgid "Send Single _Message…"
 msgstr "Bidali _Mezu Bakarra"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 #, fuzzy
 msgid "Send Cus_tom Status"
@@ -616,25 +648,25 @@ msgstr "Transportea"
 msgid "_Modify Transport"
 msgstr "Trans_porteak Erakutsi"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Berrrizenpetu"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 #, fuzzy
 msgid "Remo_ve"
@@ -650,211 +682,231 @@ msgstr "Kontaktuaren Informazioa"
 msgid "Send File..."
 msgstr "Bidali _Fitxeroa"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kontaktua"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Zerrendara Sartu"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historiala"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Talde Agenda Moldatu"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Aldatu _Gaia"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Gela Konfigu_ratu"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Deskribapena: %s"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Aldatu _Izengoitia"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "_Talde Agendan Sartu Gela hau"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Ahotsa"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Ezarritako egoerak:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Komandoa Exekutatu..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Kontaktua Gehitu..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "fitxeroa"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Bidali _Mezu Bakarra..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Aurreratua"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Hobespenak"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Zerbitzaria"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr " XML Konsola"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Admin"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Bidali Zerbitzarira Mezua"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Ezarri MOTD"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "MOTD Gaurkotu"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Ezabatu MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Kontuak"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "mezua"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Emoticonoak:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Izengoitia"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mezua"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Gaia"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Garbitu nahi al duzu datu basea?(EZ DA GOMENDATZEN GAJIM ABIARAZIA BADAGO)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -869,98 +921,98 @@ msgstr ""
 "\n"
 "BAI sakatu baduzu, mesedez itxoin..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Historialeko Log-ak Esportatzen...."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s-ean esan du: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Ziur al zaude hautaturiko kontaktuaren log-a ezabatu nahi duzula?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 msgstr[1] "Ziur al zaude hautaturiko mezuak ezabatu nahi dituzula?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Itzulgaitza den operazio bat da hau."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Profila jasotzen..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formatua: YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informazioa jasoa"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Profila bidaltzen..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informazio EZ argitaratua"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -978,10 +1030,10 @@ msgstr "Kontaktuaren izena: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Orokorra"
@@ -1073,37 +1125,37 @@ msgstr "Mesedez ezarri sartu nahi duzun kontaktuaren informazioa %s kontuarako"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1111,61 +1163,61 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "GTK+ Jabber bezeroa"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ Bertsioa:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK Bertsioa:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Egungo diseinatzaileak: "
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Aurre diseinatzaileak: "
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Azkenak baina ez gutxien merezitakoak,\n"
 "eskerrak eman nahi dzkiegu paketeak mantentzen dituztenei."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1176,13 +1228,13 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konektatu"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1191,505 +1243,529 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "E_z galdetu berriro  "
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Baliogabeko izena"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Harpidetza Eskaria"
+
+#: gajim/dialogs.py:2284
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Txat Taldean Sartu"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Sarrera baliogabea"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Baliogabeko izena"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Mezu berria sortu"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Host okerra"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Hau ez da txat talde bat"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Izena"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Konektatu"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Txat Taldea Berria"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Kontaktu Berri bat Sartu"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontua erabiliz"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuan"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "%s naiz"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Arratsaldea"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtroa:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML Sarrera</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Bidali"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Stalled"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "_Eraldatu"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Ezabatu"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Gehitu"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 #, fuzzy
 msgid "Modify"
 msgstr "_Eraldatu"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 #, fuzzy
 msgid "Groups"
 msgstr "Taldea"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Kontaktua _Sartu"
 msgstr[1] "Kontaktua _Sartu"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Zerrendatik kontaktua ezabatu"
 msgstr[1] "Zerrendatik kontaktua ezabatu"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Hobespenak"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Sarrera berri bat jaso duzu:"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Avahi error"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Debekatze Zerrenda"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Agindua: %s, akzioa: %s, mota %s, balorea %s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Agindu: %s, ekintza: %s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Baliogabeko izen zerrenda"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Izen bat sartu beharra duzu debekatze zerrenda bat egiteko."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Gela honetan ukatua izan zara."
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Irudiak"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Aukeratu Irudia"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Fitxategi guztiak"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "%s konturako"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1713,334 +1789,372 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Fitxero Transferentzia"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Enkriptazioa desaktibatuta"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ez zaude gela honetan \"%s\"jadanik edo \"%s\" joan da."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Metacontacts storage not supported by your server"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Jabber ID gela baliogabea"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Deskribapena: %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 #, fuzzy
 msgid "and authenticated"
 msgstr "Erabili autentifikazioa"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Erabili autentifikazioa"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 #, fuzzy
 msgid "Conversation with "
 msgstr "Elkarrizketaren Historiala"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konektatu"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s debekatu da %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afizioak: "
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Fitxero Transferentzia"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Fitxero Transferentzia"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2048,7 +2162,7 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2057,106 +2171,106 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Tamaina: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Onartu"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Sartu"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 #, fuzzy
 msgid "Error opening file"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 #, fuzzy
 msgid "Groupchats"
 msgstr "Txat Taldeak"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transportea"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "\"%s\" harpidetza onartzen baduzu bere egoera ikus ahal izango duzu."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2164,11 +2278,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2176,55 +2290,55 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Fitxategi transferentzia kantzelatu"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "Mezuak gero irakurri ahalko dira historiala aktibatua baduzu."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Irakurri behar dituzu transporte hau ezabatu baino lehen."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -2233,11 +2347,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transporteak ezabatuko dira"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2246,68 +2360,68 @@ msgstr ""
 "Ezin izango duzu transporte hauetako kontaktuen mezuak jaso ezta bidali ere: "
 "%s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Sartu %s kontaktuarentzat nick berri bat"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Berrrizenpetu Taldea"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Ezabatu Taldea"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ezabatu nahi al duzu %s taldea zerrendatik?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2317,12 +2431,12 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Zer nahi duzu egitea?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2331,15 +2445,15 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Kontaktu hau ezabatu ondoren nire egoera jakitea nahi dut"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktuak ezabatuak izango dira zure zerrendatik"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2349,38 +2463,38 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2389,12 +2503,12 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2404,200 +2518,200 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Fitxero Baliogabea"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s fitxero bat bidali nahi dizu:"
 msgstr[1] "%s fitxero bat bidali nahi dizu:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Bidali %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Egin %s eta %s metacontacts"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Argitaratu"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Argitaratu"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "_Zerbitzuak Aurkitu..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "_Bidali Taldeari Mezua"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Kontaktu guztiei"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Konektatutako kontaktu guztiei"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Honera gonbidatu"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Berridatzi Kontaktua"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editatu _Taldeak"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Ezabatu"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historiala"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "T_xat Talde Berrian Sartu"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Egoera Mezua aldatu"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Ikusi _zerrendan bakarrik"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Konfigurazio Aurreratuaren Editorea"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Gelaren Konfigurazioa"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Ikusi Gabeko _Gertaerak"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Zer nahi duzu egitea?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Konektatzen"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "%d mezu irakurri gabe"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2606,7 +2720,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2614,7 +2728,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2762,16 +2876,16 @@ msgstr "Enkriptazioa desaktibatuta"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
@@ -2803,10 +2917,19 @@ msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "Denak"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
+#: gajim/config.py:1949
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Denak"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
@@ -2875,12 +2998,12 @@ msgstr "Sarrera baliogabea"
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2979,92 +3102,115 @@ msgstr "Txat Taldeko Mezu Nabarmendua"
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "Gela honetako %(owner_or_admin_or_member)s "
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Inor ez"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Partaidea"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administratzailea"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Jabea"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 #, fuzzy
 msgid "Connected"
 msgstr "Konektatu"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Deskargatu"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Kargatu"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Mota: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Osatua"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Gelditua"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Stalled"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Egoera: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Gelditua"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Kanpoan"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Deskonektatuta"
 
@@ -3116,125 +3262,129 @@ msgstr "(Ezer ez)"
 msgid "Hidden"
 msgstr "Ikusezin"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Elkarrizketa Historiala %s-rekin"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Elkarrizketaren Historiala"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s orain %(status)s dago: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Errore mezua: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Egoera Mezua aldatu"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz "
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Talde Agenda Moldatu"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Ez dago zerrendan"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Ikusi _Zerrenda"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Hostname: "
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "%s gordea"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3396,59 +3546,65 @@ msgstr "_Harpidetu"
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "At_era"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr " \"%s\" -rako _aukerak"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL hiztegia galdu egin da \"%s\" -an eta ez dago WIKTIONARY-an"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "JID Baliogabea"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3460,32 +3616,37 @@ msgstr[1] "Atzo"
 msgid "Write a message.."
 msgstr "Mezu Pribatu Berri Bat"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Txat Taldeak"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Mezuak"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3496,276 +3657,281 @@ msgstr ""
 "Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste izengoiti bat:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Pasahitza behar da gela honetan sartzeko."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Soinuak</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Gela honetan ukatua izan zara."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Gela sortzea mugatua dago."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Ezin da gela honetara sartu"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Erregistratutako izengoitia erabilia izan behar da."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ez zaude kideen zerrendan."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 #, fuzzy
 msgid "Subscription request"
 msgstr "Harpidetza Eskaria"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Begiratzaileak"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Harpidetza ezabat_u"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Aukeratu Bidaltzeko Fitxeroa..."
+
+#: gajim/gui_interface.py:1196
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Mezu _guztietan"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3773,7 +3939,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3783,15 +3949,15 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3806,46 +3972,46 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Hau ez da txat talde bat"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Hau ez da txat talde bat"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3853,42 +4019,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 #, fuzzy
 msgid "default"
 msgstr "Berezkoa"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "%s konektatu behar zara OpenPGP-rik gabe."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
@@ -3960,6 +4126,11 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3993,7 +4164,7 @@ msgstr "Sarrera baliogabea"
 msgid "The form is not filled correctly."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Ikusezin"
 
@@ -4123,6 +4294,56 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Ezin izan da zerbitzu lokalak hasi"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ezin izan da irudia kargatu"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Ezin izan da irudia kargatu"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Enkriptazioa aktibatuta"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Konexioa ez dago erabilgarri"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Gaia"
@@ -4149,7 +4370,16 @@ msgstr "Ezin duzu zure berezko gaia ezabatu"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Batu kontuak"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr ""
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Be right back."
 
@@ -4171,6 +4401,11 @@ msgstr "Txat-a %s kontuan ireki duzu"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Ezabatu"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4365,64 +4600,84 @@ msgstr "Aldatu Pasahitza"
 msgid "Login Options"
 msgstr "Emoticonoak:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "D-bus ez dago ordenagailu honetan edo python moduloak ez daude erabilgarri"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "command"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "show help on command"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Agertarazi leiho bat hurrengo irakurri gabeko gertaerarekin"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan "
 "agertuko dira."
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "kontua"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "Ikusi emandako kontaktuak bakarrik"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Inprimatu erregistratutako kontuen lista"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "egoera"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mezua"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "egoera mezua"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4431,17 +4686,22 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Lehentas_una:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4451,7 +4711,7 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4461,29 +4721,29 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "mezuaren edukia"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hautatua badago, kode publikoa erabiliz enkriptatuko da mezua"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4493,121 +4753,121 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "gaia"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "mezuaren gaia"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Kontuaren izena"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "fitxeroa"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera ezabatu"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "giltza"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim-en berezko preferentzien egoera .config fitxategian idatzi"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "hautatua badago, kontaktua kontu honen kontaktu listatik lortuko da."
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Oraingo egoera itzuli (Globala, ez badago kontu bat aukeratuta)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Oraingo egoera mezua itzuli (Globala aukeratu ez badago kontu bat aukeratuta)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Irakurri gabeko mezuen kontaketa itzuli"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr " XML bidaltzeko"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4615,17 +4875,17 @@ msgid ""
 msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4633,21 +4893,21 @@ msgid ""
 msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4656,31 +4916,31 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4691,7 +4951,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4700,7 +4960,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4874,11 +5134,6 @@ msgstr "Aste bukaera"
 msgid "Weekend!"
 msgstr "Asteburua!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "%s kontukoa"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4903,52 +5158,52 @@ msgstr "Autorizazioa ezabatua izan da."
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Mezu Pribatu Berri Bat %s gelatik"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Egoera Aldatu du"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Konektatuta"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Deskonektatuta"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 #, fuzzy
 msgid "Not in roster"
 msgstr "Ez dago zerrendan"
@@ -5730,75 +5985,73 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5806,179 +6059,189 @@ msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Erabili autentifikazioa"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Erabili autentifikazioa"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Erabili autentifikazioa"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Jaten"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Filmea"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Lanean"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "kanpoan"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Libre."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Ez Erabilgarri."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Ez nahasi."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Agur!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -5986,27 +6249,27 @@ msgstr ""
 "Soinua bat entzun MUC-ak muc_highlight_words-eko hitz bat agertzean edota "
 "gela bateko mezu batek zure izengoitia duenean."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "berdea"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "gizakia"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "arrantzale"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Norentzat"
@@ -6095,37 +6358,52 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr "%d mezu irakurri gabe"
 
+#: gajim/common/httpupload.py:137
+#, fuzzy
+msgid "File is empty"
+msgstr "Fitxeroaren tokia"
+
+#: gajim/common/httpupload.py:140
+#, fuzzy
+msgid "File does not exist"
+msgstr "Honako gela honek ez du existitzen."
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "logs-en datu basea sortzen"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "logs-en datu basea sortzen"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Bidali %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s fitxero bat da baina direktorio bat izan daiteke"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
@@ -6135,11 +6413,11 @@ msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indeces"
@@ -6149,237 +6427,237 @@ msgstr "migrating logs database to indeces"
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Baliogabeko izena"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Manualki konektatu berriro."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "%s gordea"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konexioak huts egin du"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktua"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Ez bidali ikusezin egoerarengatik"
 
@@ -7315,255 +7593,280 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Baliogabeko karakterea hostname -ean."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Zerbitzariaren helbidea behar da."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Baliogabeko karakterea izenean."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "Gelditua"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Ezin da jakin"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Errorea du"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Inork ez"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Norentzat"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "-etik"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Biak"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Inork ez"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Inor ez"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Partaideak"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Partaidea"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "mezu bat sortzen ari da..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gib"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bidali mezua"
 msgstr[1] "Bidali mezua"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "%s naiz"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "-etik"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "mezua"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
@@ -7599,45 +7902,45 @@ msgstr ""
 "Bus saioa ez dago erabilgarri.\n"
 "Saiatu irakurtzen http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Ezin izan da zerbitzu lokalak hasi"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ezin izan da \"%s\" -ren egoera aldatu"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
@@ -7889,6 +8192,11 @@ msgstr "_Debekatu"
 msgid "_Add to Roster"
 msgstr "_Zerrendara Sartu"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Komandoa Exekutatu..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8202,11 +8510,11 @@ msgstr "About"
 msgid "Con_tinue"
 msgstr "_Jarraitu"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Eten"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_kantzelatu"
@@ -8215,34 +8523,34 @@ msgstr "_kantzelatu"
 msgid "_Open Containing Folder"
 msgstr "_Ireki Fitxeroaren Edukia"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Fitxero Transferentzia"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "fitxeroen transferentziaren lista"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Garbitu"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Ezabatu  kantzelatuak, osorik eta huts egin dutenak  fitxero transferentzia "
 "zerrendatik"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Listatik fitxero tranferentzia ezabatu."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8250,34 +8558,39 @@ msgstr ""
 "Aukera honek fitxero transferentzia bakar bat kantzelatzen du. "
 "Transferentzia martxan badago, lehenik gelditu egingo da eta ondoren ezabatu."
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Kantzelatu aukeratutako fitxategi transferentzia eta ezabatu bukatu gabeko "
 "fitxeroa "
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Fitxategi transferentzia kantzelatu"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Kantzelatu aukeratutako fitxategi transferentzia"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Bidali eta Itxi"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Leihoa ezkutatu"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Jakinarazi  fitxeroa transferitu denean"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 #, fuzzy
 msgid "Shows a list of file transfers between you and others"
 msgstr "Erakutsi zu eta beste baten arteko fitxero transferentzia"
@@ -8287,7 +8600,7 @@ msgid "Register to"
 msgstr "Erregistratu honetara"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8321,22 +8634,22 @@ msgstr "_Mota:"
 msgid "Clear formatting"
 msgstr "Kontaktuaren Informazioa"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Gertaera"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Gertaerak"
@@ -8399,7 +8712,7 @@ msgstr "<b>Soinuak</b>"
 msgid "<b>#</b>"
 msgstr "<b>Soinuak</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9175,10 +9488,6 @@ msgstr "_Ireki..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Konfigurazio Aurreratuaren Editorea</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Aurreratua"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Elkarrizketa _Hasi"
@@ -9436,7 +9745,7 @@ msgid "_Open Email Composer"
 msgstr "_Ireki E-posta Konposatzailea"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "Elkarrizketa  _Hasi"
 
@@ -9482,6 +9791,10 @@ msgstr "Hobespenak"
 msgid "Default:"
 msgstr "Berezkoa"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Kontaktu Berri bat Sartu"
@@ -9507,6 +9820,16 @@ msgstr "_Izengoitia:"
 msgid "_Group:"
 msgstr "Ta_ldea:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Erabiltzailearen ID:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Izengoitia"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9544,6 +9867,11 @@ msgstr ""
 "Transporte batera konektatuta egon behar zara\n"
 "protokolo honetako kontaktu bat sartzeko."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Egoera Mezua aldatu"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -9774,10 +10102,10 @@ msgstr "_Komandoa Exekutatu..."
 msgid "_Verify"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Kontuak"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Deskribapena</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9804,11 +10132,6 @@ msgstr "Ikusi _Deskonektatutako Kontaktuak"
 msgid "Show Transports"
 msgstr "Trans_porteak Erakutsi"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Fitxero Transferentzia"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9882,51 +10205,36 @@ msgstr ""
 msgid "Pr_int status:"
 msgstr "Inprimatu egoera:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Deskribapena"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Report Bug"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Seguraski ez da garrantzitsua, baina diseinatzailei abisatu beharko "
 "litzateke."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Harpidetza Eskaria"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Report Bug"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Ukatu"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Autorizazioa ezeztatu, honela kontaktuak ezin du zure egoera ikusi"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Aukerak"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Autorizatu"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 #, fuzzy
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Kontaktu autorizatua beraz, zure egoera ikus dezake"
@@ -9945,27 +10253,32 @@ msgstr ""
 msgid "Presets"
 msgstr "_Egoera"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
 msgid "MUC server"
 msgstr "Begiratzaileak"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Honera gonbidatu"
@@ -10086,11 +10399,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Arratsaldea"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10256,6 +10564,16 @@ msgstr "Ikusi Gabeko _Gertaerak"
 msgid "Mute Sounds"
 msgstr "Soinua Kendu"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Hobespenak"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "At_era"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Norentzat:"
@@ -10662,14 +10980,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Gelaren Konfigurazioa"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "IM Jabber Bezeroa"
@@ -10794,6 +11104,23 @@ msgid "Plugin manager"
 msgstr "Konexioak huts egin du"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "%s kontukoa"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Deskribapena"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
+
+#~ msgid "_Actions"
+#~ msgstr "_Aukerak"
+
+#, fuzzy
 #~ msgid "Start Chat..."
 #~ msgstr "Elkarrizketa  _Hasi"
 
@@ -10974,14 +11301,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
-#, fuzzy
-#~ msgid "File is empty"
-#~ msgstr "Fitxeroaren tokia"
-
-#, fuzzy
-#~ msgid "File does not exist"
-#~ msgstr "Honako gela honek ez du existitzen."
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10990,59 +11309,6 @@ msgstr "Konexioak huts egin du"
 #~ "avatar last time or has one cached that is too old."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "Gelditua"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "Gelditua"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Ezin da jakin"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Errorea du"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Inork ez"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Inork ez"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Inor ez"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "Inor ez"
-
-#~ msgid "?print_status:All"
-#~ msgstr "Denak"
-
-#, fuzzy
-#~ msgid "?print_status:None"
-#~ msgstr "Denak"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Libre"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "kontua"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "egoera"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "mezua"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Lehentas_una:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "-etik"
 
@@ -11054,31 +11320,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "?CLI:password"
 #~ msgstr "Pasahitza:"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Txat Taldeak"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Deskargatu"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Kargatu"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "Gelditua"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Aurkitu gabea"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Aurkitu gabea"
-
-#, fuzzy
-#~ msgid "?Time:Unknown"
-#~ msgstr "Aurkitu gabea"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Erabili D-Bus eta Notification-Daemon jakinarazketak erakusteko"
 
@@ -11403,18 +11644,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML Sarrera</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtroa:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML Sarrera</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Bidali"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML Konsola %s-rena"
 
@@ -11642,10 +11871,6 @@ msgstr "Konexioak huts egin du"
 #~ msgstr "arreta jartzen ari da elkarrizketara"
 
 #, fuzzy
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Deskribapena</b>"
-
-#, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Kontaturen izena"
 
@@ -12403,10 +12628,6 @@ msgstr "Konexioak huts egin du"
 #~ msgstr "Kontaktu hau dagoeneko Gajim-en konfiguratua dago."
 
 #, fuzzy
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP: "
-
-#, fuzzy
 #~ msgid "Idle"
 #~ msgstr "Id"
 
@@ -12436,12 +12657,6 @@ msgstr "Konexioak huts egin du"
 #~ "Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
 #~ "gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Enkriptazioa aktibatuta"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Enkriptazioa desaktibatuta"
-
 #~ msgid "_Retype Password:"
 #~ msgstr "_Berridatzi Pasahitza"
 
diff --git a/po/fr.po b/po/fr.po
index 37defcd45..496e2478e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\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"
@@ -22,20 +22,20 @@ msgstr "Ping ?"
 msgid "Error."
 msgstr "Erreur."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr "A_nnuler"
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Envoyer vraiment le fichier ?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Si vous envoyer un fichier à %s, il/elle connaîtra votre vrai JID."
@@ -90,69 +90,69 @@ msgstr "Durée"
 msgid "Progress"
 msgstr "Progression"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Taille : %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Vous"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Destinataire : "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enregistré dans : %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 msgid "Open _Containing Folder"
 msgstr "Ouvrir le dossier de destination"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinataire : %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Message d'erreur : %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -162,32 +162,32 @@ msgstr ""
 "Le fichier %(file)s a été reçu, mais il semble avoir été endommagé.\n"
 "Voulez-vous le télécharger de nouveau ?"
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 msgid "Choose File to Send…"
 msgstr "Choisissez un fichier à envoyer..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "En_voyer"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Description :"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 msgid "Gajim can not read this file"
 msgstr "Gajim ne peut pas lire ce fichier"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr "Un autre processus utilise ce fichier."
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Impossible de remplacer le fichier existant \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -195,90 +195,90 @@ msgstr ""
 "Un fichier du même nom existe déjà et vous n'avez pas la permission de "
 "l'écraser."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Que voulez vous faire ?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Le dossier \"%s\" n'est pas accessible en écriture"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Vous n'avez pas les permissions de créer des fichiers dans ce dossier."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 msgid "Save File as…"
 msgstr "Enregistrer le Fichier sous…"
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 msgid "Checking file…"
 msgstr "Vérification du fichier…"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 msgid "File error"
 msgstr "Erreur de fichier"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Fichier non valide"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Fichier : "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Nom : "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pause"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Continuer"
 
@@ -447,50 +447,70 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Nécessite gir1.2-gupnpigd-1.0."
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "?features:Disponible"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Fonctionnalité"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Erreur lors de l'analyse du fichier :"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Extension non supportée"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "L'image ne peut être enregistrée en format %(type)s. Enregistrer en tant que "
 "%(new_filename)s ?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 msgid "Save Image as…"
 msgstr "Enregistrer l'image sous…"
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "Enregistrer _sous"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Inconnu"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Inconnu"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Date:Inconnue"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "<b>Role :</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation :</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr ""
 "Ce contact s'intéresse à votre état, mais vous ne vous intéressez pas au sien"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
@@ -498,38 +518,46 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact, mais il ne s'intéresse pas au "
 "vôtre"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 msgid "The contact and you want to exchange presence information"
 msgstr "Vous et ce contact vous intéressez à vos états réciproques"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Vous et ce contact ne vous intéressez pas à vos états réciproques"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Vous attendez la réponse de ce contact pour votre demande de voir son état"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Il n'y a aucune requête d'inscription en attente."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Tous les fichiers"
 
+#: gajim/options_dialog.py:392
+msgid "Clear File"
+msgstr "Effacer le fichier"
+
+#: gajim/options_dialog.py:474
+msgid "Manage Proxies"
+msgstr "Gérer les proxies"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -570,13 +598,13 @@ msgid "_New Group Chat"
 msgstr "_Nouveau Salon de Discussion"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
@@ -588,7 +616,7 @@ msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 msgid "Send Single _Message…"
 msgstr "Envoyer un _message simple…"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Envoyer un Statut Personnalisé"
@@ -605,24 +633,24 @@ msgstr "_Gérer les Passerelles"
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 msgid "_Rename…"
 msgstr "Re_nommer…"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Débloquer"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Bloquer"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Suppri_mer"
@@ -635,177 +663,195 @@ msgstr "Information"
 msgid "Send File..."
 msgstr "Envoyer un fichier..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 msgid "Invite Contacts"
 msgstr "Inviter des contacts"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 msgid "Add to Roster"
 msgstr "Ajouter à la liste de contacts"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr "Session audio"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr "Session vidéo"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 msgid "Information"
 msgstr "Information"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Historique"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 msgid "Manage Room"
 msgstr "Gérer le salon"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 msgid "Change Subject"
 msgstr "Changer le sujet"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 msgid "Configure Room"
 msgstr "Configurer le salon"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 msgid "Destroy Room"
 msgstr "Détruire le salon"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 msgid "Change Nick"
 msgstr "Changer de surnom"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 msgid "Bookmark Room"
 msgstr "Enregistrer ce salon dans les marque-pages"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 msgid "Request Voice"
 msgstr "Demander la parole"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "Avertir pour tous les messages"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr "Minimiser à la fermeture"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+msgid "Execute command"
+msgstr "Exécuter une commande"
+
+#: gajim/gui_menu_builder.py:656
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 msgid "Add Contact..."
 msgstr "Ajouter un contact..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 msgid "Profile"
 msgstr "Profil"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 msgid "Discover Services"
 msgstr "Découvrir les services"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 msgid "Send Single Message..."
 msgstr "Envoyer un message simple..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avancées"
+
+#: gajim/gui_menu_builder.py:737
 msgid "Archiving Preferences"
 msgstr "Éditer les préférences d'archivage"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 msgid "Synchronise History"
 msgstr "Synchroniser l'historique"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 msgid "Server Info"
 msgstr "Informations du serveur"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Console XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+msgid "Admin"
+msgstr "Admin"
+
+#: gajim/gui_menu_builder.py:744
 msgid "Send Server Message..."
 msgstr "Envoyer un message au serveur..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Définir MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Mettre à jour MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 msgid "Delete MOTD..."
 msgstr "Supprimer MOTD..."
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 msgid "No Accounts available"
 msgstr "Aucun compte disponible"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Comptes"
+
+#: gajim/history_manager.py:56
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 msgid "Options:"
 msgstr "Options :"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr "Affiche ce message d'aide et quitte"
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr "Indiquer un répertoire pour le fichier de log"
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Impossible de trouver la base de données de l'historique"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "Identifiant Jabber"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Date"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Pseudonyme"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Message"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Sujet"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -813,7 +859,7 @@ msgstr ""
 "Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST "
 "LANCÉ)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -827,89 +873,89 @@ msgstr ""
 "\n"
 "Si vous choisissez OUI, patientez…"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr "Nettoyage de la base de données"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 msgid "Exporting History Logs…"
 msgstr "Exportation de l'historique…"
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s le %(time)s a dit: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Voulez-vous vraiment supprimer les logs de %(jid)s ?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Voulez vous réellement supprimer l'historique de ces contacts ?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 msgid "This can not be undone."
 msgstr "Ceci ne peut pas être annulé."
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr "Confirmation de la suppression"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Voulez-vous vraiment supprimer le message sélectionné ?"
 msgstr[1] "Voulez-vous vraiment supprimer les messages sélectionnés ?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Ceci est une opération irréversible."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 msgid "Retrieving profile…"
 msgstr "Récupération du profil…"
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Impossible de charger l'image"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "Mauvais format de date"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format : AAAA-MM-JJ"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Invitation reçue"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Vous devez être connecté pour publier vos informations."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 msgid "Sending profile…"
 msgstr "Envoi du profil…"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "l'information n'a PAS été publiée"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -927,10 +973,10 @@ msgstr "Nom du contact : <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Général"
@@ -1017,35 +1063,35 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Vous ne pouvez pas vous ajouter à votre propre roster."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 msgid "Error while adding transport contact"
 msgstr "Erreur en ajoutant un contact d'un transport"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1057,58 +1103,58 @@ msgstr ""
 "\n"
 "%(error)s"
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 msgid "A GTK+ XMPP client"
 msgstr "Un client XMPP en GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, python-format
 msgid "GTK+ Version: %s"
 msgstr "Version de GTK+ : %s"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, python-format
 msgid "PyGObject Version: %s"
 msgstr "Version de PyGObject : %s"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr "python-nbxmpp Version : %s"
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 msgid "Current Developers"
 msgstr "Développeurs actuels"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 msgid "Past Developers"
 msgstr "Anciens développeurs"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr "Artistes"
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr "Enfin et surtout"
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 msgid "we would like to thank all the package maintainers."
 msgstr "nous voulons remercier tous les mainteneurs de paquet."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Yann Leboulanger <asterix@lagaule.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>\n"
 "Florent Le Coz <louizatakk@fedoraproject.org>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Dictionnaire pour la langue \"%s\" indisponible"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1122,12 +1168,12 @@ msgstr ""
 "\n"
 "Le soulignement des fautes d'orthographe ne sera pas utilisé"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Connexion non-sécurisée"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1140,274 +1186,294 @@ msgstr ""
 "chiffrées, et cela est vraiment déconseillé.\n"
 "Êtes vous sûr de vouloir faire cela ?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim ne se connectera pas si vous ne cochez pas cette case."
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "_Ne plus me poser la question"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "Reprendre"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "Remplacer"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 msgid "The nickname contains invalid characters."
 msgstr "Le pseudonyme contient des caractères non valides."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Requête d'Inscription"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Requête d'inscription pour le compte %(account)s de la part de %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 msgid "Join Groupchat"
 msgstr "Rejoindre un salon de discussion"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 msgid "Invalid Room"
 msgstr "Salon invalide"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr "Veuillez choisir un salon"
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 msgid "Please choose a nickname"
 msgstr "Veuillez choisir un surnom"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas "
 "connecté."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 msgid "Wrong server"
 msgstr "Mauvais serveur"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, python-format
 msgid "%s is not a groupchat server"
 msgstr "%s n'est pas un serveur de salons de discussion"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nom"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Serveur"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Ce compte est connecté au serveur"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Vous ne pouvez pas vous synchroniser avec un compte sauf s'il est connecté."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 msgid "Start new Conversation"
 msgstr "Démarrer une nouvelle conversation"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 msgid "New Groupchat"
 msgstr "Nouveau salon de discussion"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Nouveau courrier électronique"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de fichier"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Transfert de fichier terminé"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple dans le compte %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Message simple"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "De %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 "Il n'est pas possible d'envoyer un message à %s, ce JID n'est pas valide."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+msgid "Clear"
+msgstr "Effacer"
+
+#: gajim/dialogs.py:3563
+msgid "Filter"
+msgstr "Filtre"
+
+#: gajim/dialogs.py:3568
+msgid "XML Input"
+msgstr "Entrée XML"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Envoyer"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "Ajouter"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "Modifier"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "Supprimer"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1416,197 +1482,197 @@ msgstr ""
 "<b>%(jid)s</b> aimerait que vous <b>%(action)s</b> quelques contacts dans "
 "votre liste."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Ajouter"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Modifier"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Supprimer"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Groupes"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s m'a conseillé de vous ajouter à mes contacts."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "%d contact ajouté"
 msgstr[1] "%d contacts ajoutés"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "%d contact supprimé"
 msgstr[1] "%d contacts supprimés"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Sauvegarde des préférences pour %s"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr "Succès !"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Your Archiving Preferences have been saved!"
 msgstr "Vos préférences d'archivage ont été sauvegardées !"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr "Aucune réponse du serveur"
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr "Nous avons reçu une erreur : {}"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 msgid "Error!"
 msgstr "Erreur !"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 msgid "Add JID"
 msgstr "Ajouter un JID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste privée <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste privée pour %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Liste privée"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ordre : %(order)s, action : %(action)s, type : %(type)s, valeur : %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordre : %(order)s, action: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifier une règle</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ajouter une règle</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listes privées pour %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Nom de liste invalide"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Vous devez entrer un nom pour créer une liste privée."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
-msgstr "Vous êtes invité(e) dans un groupe de discussion"
+msgstr "Vous êtes invité⋅e dans un groupe de discussion"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vous a invité dans un salon de discussion"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact vous a invité dans le salon de discussion %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Voulez-vous accepter l'invitation ?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr "Raison (si vous refusez) :"
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "Choisissez le certificat client #PCKS12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "Fichier PKCS12"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Images"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "Choisissez une Archive"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "fichiers Zip"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "audio et vidéo"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "audio"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "vidéo"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -1615,12 +1681,12 @@ msgstr ""
 "%(contact)s veut démarrer un session %(type)s avec vous. Voulez-vous "
 "répondre à son appel ?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr "Certificat pour le compte %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1663,66 +1729,91 @@ msgstr ""
 "\n"
 "Empreinte SHA-256 : %(sha256)s\n"
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Validation de certificat SSL pour %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr "Voir cert…"
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+msgid "File Transfer"
+msgstr "Transfert de fichiers"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr "Demande d'envoi de fichier par HTTP..."
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr "Envoi du fichier via l'envoi de fichiers par HTTP..."
+
+#: gajim/dialogs.py:5446
+msgid "Encrypting file..."
+msgstr "Chiffrement du fichier..."
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s est maintenant connu en tant que %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s est maintenant %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Vous n'êtes plus dans le salon « %(room)s » ou « %(nick)s » l'a quitté."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr "Envoi de fichiers par HTTP"
+
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr "L'envoi de fichiers par HTTP n'est pas supporté par votre serveur"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 msgid "Invalid group chat JID"
 msgstr "JID de salon de discussion non invalide"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 msgid "The group chat JID has not allowed characters."
 msgstr "Le JID du salon de discussion contient des caractères interdits."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruction de %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
@@ -1730,245 +1821,253 @@ msgstr ""
 "Vous êtes sur le point de supprimer définitivement ce salon.\n"
 "Vous pouvez spécifier une raison ci-dessous :"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "et authentifiée"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "et NON authentifiée"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "Chiffrement %(type)s actif %(authenticated)s."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Conversation avec "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Conversation continuée"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s a changé le sujet en %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 "N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr "Le salon affiche dorénavant les membres non-disponibles"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr "Le salon n'affiche plus les membres non-disponibles"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr "Un paramètre non lié à la vie privée a été changé"
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "L'enregistrement des conversations du salon est maintenant activé"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Le salon n'est plus anonyme"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Le salon est maintenant sami-anonyme"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr "Le salon est maintenant totalement anonyme"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong ! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(jid)s a été invité dans ce salon"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "L'enregistrement des conversations du salon est activé"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Le serveur à défini ou modifié votre Surnom de salon"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a été banni par %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s a été éjecté du salon (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "Changement d'affiliation"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "La configuration du salon a changé pour « membres seulement »"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "Extinction du système"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** L'affiliation de %(nick)s a été définie à %(affiliation)s par %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** L'affiliation de %(nick)s a été définie à %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Le rôle de %(nick)s a été défini à %(role)s par %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Le rôle de %(nick)s a été défini à %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
-msgstr "Si vous fermez cette fenêtre, vous serez déconnecté(e) de ce salon."
+msgstr "Si vous fermez cette fenêtre, vous serez déconnecté⋅e de ce salon."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+msgid "Jingle File Transfer"
+msgstr "Transfert de fichiers Jingle"
+
+#: gajim/chat_control.py:331
+msgid "No File Transfer available"
+msgstr "Pas de transfert de fichier disponible"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Afficher une liste de styles"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr "Le formatage n'est pas disponible lorsque GPG est activé"
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
 msgstr "Ce contact ne prend pas en charge le HTML"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "État %(type)s : %(state)s, raison : %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s du salon de discussion %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Négociation annulée"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "Cette session sera archivée sur le serveur"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "La session ne sera PAS archivée sur le serveur"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Cette session est chiffrée"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " et SERA archivée"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " et NE SERA PAS archivée"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -1976,16 +2075,16 @@ msgstr ""
 "Identité du contact non vérifiée. Cliquez sur le bouton bouclier pour plus "
 "de détails."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "Chiffrement E2E désactivé"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vous venez de recevoir un nouveau message de \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -1993,7 +2092,7 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2002,7 +2101,7 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2011,90 +2110,90 @@ msgstr ""
 "Impossible de déchiffrer le message de %s\n"
 "Il a peut-être été manipulé."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s est maintenant %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 msgid "File transfer"
 msgstr "Transfert de fichiers"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr "Taille"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "Re_joindre"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Le contact distant à stoppé le transfert"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Erreur à l'ouverture du fichier"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Salons de discussion"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Passerelles"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 msgid "Authorization sent"
 msgstr "L'autorisation a été envoyée"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" accepte cette requête, vous connaîtrez son état."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 msgid "Authorization removed"
 msgstr "L'autorisation a été supprimée"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
-msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté(e)."
+msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté⋅e."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr "OpenPGP n'est pas utilisable"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2105,11 +2204,11 @@ msgstr ""
 "Attention il existe un paquet python appelé gnupg qui n'est pas compatible.\n"
 "Vous serez connecté à %s sans OpenPGP."
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2117,27 +2216,27 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "désynchronisé"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Vraiment quitter Gajim ?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter Gajim ?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Toujours fermer Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "Vous des transferts de fichiers en cours"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
@@ -2145,11 +2244,11 @@ msgstr ""
 "Si vous quittez maintenant, le transfert de fichier(s) sera arrêté. Voulez-"
 "vous toujours quitter ?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Vous avez des messages non lus"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2157,16 +2256,16 @@ msgstr ""
 "Les messages seront disponibles pour une lecture ultérieure si l'archivage "
 "de l'historique est actif et si le contact est dans votre liste."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Vous devez les lire avant de supprimer ce compte."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2174,11 +2273,11 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
 "passerelle."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Les passerelles seront enlevées"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2187,13 +2286,13 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ces "
 "passerelles : %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Vous êtes sur le point de bloquer un contact. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
@@ -2201,86 +2300,86 @@ msgstr ""
 "Ce contact vous verra hors-ligne et vous ne recevrez pas les messages qu'il "
 "vous enverra."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Renommer le contact"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entrez un nouveau surnom pour le contact %s."
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "_Renommer le Groupe"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entrez un nouveau nom pour le groupe %s."
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "_Supprimer le Groupe"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Voulez-vous enlever le groupe %s de la liste de contacts ?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 "Supprimer également de votre roster tous les contacts appartenant à ce groupe"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez la clé correspondant au contact"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Le contact \"%s\" sera enlevé de la liste de contacts"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Vous êtes sur le point de supprimer « %(name)s » (%(jid)s) de votre roster.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
 "always seeing you as offline."
 msgstr ""
 "En supprimant ce contact vous enlevez aussi leurs autorisations, ces "
-"contacts vous verront donc toujours déconnecté(e)."
+"contacts vous verront donc toujours déconnecté⋅e."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Voulez vous continuer ?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in them always seeing you as offline."
 msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle "
-"vous verra donc toujours déconnecté(e)."
+"vous verra donc toujours déconnecté⋅e."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Autoriser ce contact à connaître mon état après la suppression"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Les contacts seront enlevés de la liste de contacts"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2290,14 +2389,14 @@ msgstr ""
 "vous enlevez aussi leurs autorisations. Ces contacts vous verront donc "
 "toujours déconnecté(e)."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Vous êtes sur le point d'envoyer un statut personnalisé. Êtes-vous sûr de "
 "vouloir continuer ?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2306,27 +2405,27 @@ msgstr ""
 "Ce contact vous verra temporairement %(status)s, mais seulement jusqu'à ce "
 "que vous changiez votre statut. Il verra alors votre statut global."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
 "invisible."
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Le stockage des métacontacts n'est pas supporté par votre serveur"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -2335,14 +2434,14 @@ msgstr ""
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
@@ -2351,185 +2450,186 @@ msgstr ""
 "Généralement, cela est utile lorsqu'une même personne possède plusieurs "
 "comptes XMPP ou des comptes de transport."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Voulez vous envoyer ce fichier à %s :"
 msgstr[1] "Voulez vous envoyer ces fichiers à %s :"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Envoyer %(from)s à %(to)s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "Faire de %s le premier contact"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Faire de %(contact1)s et %(contact2)s des métacontacts"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "Publier la localisation"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 msgid "Configure Services…"
 msgstr "Configurer les Services…"
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viter à"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Gérer les Contacts"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 msgid "Edit _Groups…"
 msgstr "Éditer les _groupes…"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Reconnecter"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Déconnecter"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historique"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Joindre un salon de discussion"
 
-#: gajim/roster_window.py:5774
-msgid "Change Status Message…"
-msgstr "Changer le message d'état…"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 msgid "Show the application's version"
 msgstr "Afficher la version de l'application"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 msgid "Show only critical errors"
 msgstr "Ne montrer que les erreurs critiques"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 "Séparer les fichiers de profil complètement (même la base de données de "
 "l'historique et les plugins)"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr "Affiche le flux XML et autres informations de débogage"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 msgid "Use defined profile in configuration directory"
 msgstr "Utilise un profil défini dans le dossier de configuration"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 msgid "Set configuration directory"
 msgstr "Fixe le répertoire de configuration"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr "Configurer le système de log"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 msgid "Show all warnings"
 msgstr "Afficher tous les avertissements"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr "ouvrir un shell ipython"
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 msgid "How far back do you want to go?"
 msgstr "De combien voulez-vous remonter dans le temps ?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr "Un mois"
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr "Trois mois"
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr "Un an"
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr "Tout"
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s sur %(max)s"
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, python-format
 msgid "Downloaded %s Messages"
 msgstr "%s messages téléchargés"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2542,7 +2642,7 @@ msgstr ""
 "        {received} messages téléchargés.\n"
 "        "
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2554,7 +2654,7 @@ msgstr ""
 "        avec les archives.\n"
 "        "
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2700,16 +2800,16 @@ msgstr "Compte désactivé"
 msgid "To unregister from a server, account must be enabled."
 msgstr "Pour se désinscrire d'un serveur, le compte doit être activé."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
@@ -2739,10 +2839,18 @@ msgstr "Supprimer le compte de Gajim _uniquement"
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ne rien supprimer. Je réessaierai plus tard."
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Tout"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Entrées et sorties seulement"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "Aucun"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Créer un salon de discussion"
@@ -2808,11 +2916,11 @@ msgstr "Entrée invalide"
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certificat déjà dans un Fichier"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ce certificat est déjà dans le fichier %s, il n'a donc pas été ajouté."
@@ -2917,90 +3025,110 @@ msgstr "Message d'un salon mis en surbrillance"
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s de ce salon"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Aucune"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Membre"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [bloqué]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [minimisé]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Connecté"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Déconnecté(e)"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+msgid "?Noun:Download"
+msgstr "Téléchargement"
+
+#: gajim/tooltips.py:653
+msgid "?Noun:Upload"
+msgstr "Envoi"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Type : "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Non commencé"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Terminé"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:En pause"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Calé"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "État : "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "?user status:Disponible"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
-msgstr "Absent(e)"
+msgstr "Absent⋅e"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Occupé(e)"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Déconnecté(e)"
 
@@ -3049,118 +3177,122 @@ msgstr "(Aucune)"
 msgid "Hidden"
 msgstr "Éléments masqués"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr "La machine se met en veille"
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr "Déconnecté du réseau"
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historique de conversation avec %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historique de conversation"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Erreur du disque"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Erreur : %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Erreur"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 msgid "_Change Status Message…"
 msgstr "_Changer le message d'état…"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "du compte %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 msgid "_Manage Bookmarks…"
 msgstr "_Gérer les marque-pages…"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "Cacher la liste de contacts"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "Impossible de charger l'image"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Type de média non-supportée : %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "Le champ est requis"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "nouveau@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nouveau%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
-msgstr "%s jours, %s hours"
+msgid "%(days)s days, %(hours)s hours"
+msgstr "%(days)s jours, %(hours)s heures"
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 msgid "Hostname"
 msgstr "Nom d'hôte"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr "Logiciel du serveur"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 msgid "Server Uptime"
 msgstr "Durée de fonctionnement du serveur"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3320,7 +3452,7 @@ msgstr "_Ajouter"
 msgid "_Unsubscribe"
 msgstr "_Désinscrire"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3328,51 +3460,59 @@ msgstr ""
 "Le texte sous cette règle correspond à ce qui a été dit depuis\n"
 "la dernière fois que vous avez consulté ce salon de discussion"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Citation"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions pour \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Il manque un \"%s\" dans l'URL de recherche sur Internet"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Ouvrir en tant que _lien"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr "URL :"
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 msgid "Invalid URL"
 msgstr "URL non valide"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+"<b>Message corrigé. Message original :</b>\n"
+"{}"
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3383,30 +3523,34 @@ msgstr[1] "il y a %(nb_days)i jours"
 msgid "Write a message.."
 msgstr "Écrire un message.."
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Vous êtes sur le point de fermer plusieurs onglets"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Voulez-vous vraiment tous les fermer ?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+msgid "?Noun:Chats"
+msgstr "Discussions"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Messages"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3419,107 +3563,107 @@ msgstr ""
 "est actuellement utilisé ou enregistré par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Toujours utiliser ce pseudo en cas de conflit"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acceptez vous cette requête sur le compte %s ?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorisation HTTP (%(method)s) pour %(url)s (ID : %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "La connexion a échoué"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>%s</b> est rempli"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Vous êtes banni du salon <b>%s</b>."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Le serveur distant <b>%s</b> n'existe pas."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Le salon <b>%s</b> n'existe pas."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 msgid "Group chat creation is not permitted."
 msgstr "La création de salon n'est pas autorisée."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 msgid "Unable to join groupchat"
 msgstr "Impossible de rejoindre le salon"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Vous devez utiliser votre pseudonyme enregistré dans <b>%s</b>."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres du salon %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erreur %(code)s : %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erreur en envoyant %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Requête d'Inscription"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observateurs"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Le contact \"%s\" vous a autorisé à voir son état."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
@@ -3527,31 +3671,31 @@ msgstr ""
 "Vous le/la verrez toujours hors-ligne.\n"
 "Voulez vous le/la supprimer de votre liste de contacts ?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Désinscrit(e)"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s a refusé l'invitation : %(reason)s"
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s a refusé l'invitation"
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
@@ -3559,32 +3703,32 @@ msgstr ""
 "Vous avez configuré Gajim pour qu'il utilise un agent OpenPGP, mais aucun "
 "agent OpenPGP n'est lancé ou il a renvoyé un mauvais mot de passe.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 msgid "Wrong passphrase"
 msgstr "Mot de passe incorrecte"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 msgid "Wrong OpenPGP passphrase"
 msgstr "Mot de passe OpenPGP erroné"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 msgid "Certificate Passphrase Required"
 msgstr "Mot de passe du certificat requis"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Entrez le mot de passe du certificat pour le compte %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid "Untrusted OpenPGP key"
 msgstr "clé OpenPGP non approuvé"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
@@ -3592,7 +3736,7 @@ msgstr ""
 "La clef OpenPGP utilisé pour chiffrer cette conversation n'est pas approuvé. "
 "Voulez-vous vraiment chiffrer ce message ?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
@@ -3600,71 +3744,75 @@ msgstr ""
 "Copiez / Collez le jeton de rafraichissement du site web qui vient d'être "
 "ouvert."
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr "Certificat Oauth2"
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Erreur de certificat SSL"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 msgid "File Transfer Failed"
 msgstr "Échec du transfert de fichier"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s reçu de %(name)s."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Le transfert du fichier %(filename)s de la part de %(name)s a échoué."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Le transfert du fichier %(filename)s à %(name)s a échoué."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+msgid "Choose file to send"
+msgstr "Choisissez un fichier à envoyer"
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Impossible de déchiffrer le message"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Conflit de nom d'utilisateur"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3672,20 +3820,20 @@ msgstr ""
 "Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en "
 "entrer une nouvelle"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Requête de transfert de fichier"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Erreur durant la vérification du certificat SSL"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3696,7 +3844,7 @@ msgstr ""
 "serveur XMPP : %(error)s\n"
 "Voulez-vous toujours vous connecter à ce serveur ?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3711,15 +3859,15 @@ msgstr ""
 "Empreinte digitale SHA-256 du certificat :\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer cette erreur pour ce certificat."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr "Serveur non anonyme"
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3745,7 +3893,7 @@ msgstr ""
 "Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
 "certificat ?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3754,7 +3902,7 @@ msgstr ""
 "sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
 "sûr de vouloir le faire ?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3762,15 +3910,15 @@ msgstr ""
 "Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
 "chiffrée. Êtes vous sûr de vouloir le faire ?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 msgid "JID is not a Groupchat"
 msgstr "JID n'est pas un salon de discussion"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Émoticônes désactivées"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3778,7 +3926,7 @@ msgstr ""
 "Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc "
 "désactivées."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
@@ -3786,11 +3934,11 @@ msgstr ""
 "Votre thème d'émoticônes n'a pu être chargé. Voir les logs pour plus "
 "d'informations."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Ceci n'est pas une conversation multi-utilisateurs"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3801,41 +3949,41 @@ msgstr ""
 "%(room_jid)s est un JID de salon de discussion correcte. Dans ce cas, "
 "supprimez-le de votre liste de contacts et réessayez de joindre le salon."
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "Par défaut"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Entrez votre mot de passe OpenPGP pour la clé %(keyid)s (compte %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 msgid "OpenPGP key expired"
 msgstr "Clef OpenPGP expirée"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Votre clef OpenPGP a expiré, vous serez connecté(e) à %s sans OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Mot de passe erroné"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Veuillez ressaisir votre mot de passe OpenPGP ou appuyez sur Annuler."
 
@@ -3906,6 +4054,10 @@ msgstr "- les messages seront archivés"
 msgid "- messages will not be logged"
 msgstr "- les messages ne seront pas archivés"
 
+#: gajim/notify.py:103
+msgid "Open"
+msgstr "Ouvrir"
+
 #: gajim/dialog_messages.py:33
 msgid "You can not start a new conversation unless you are connected."
 msgstr ""
@@ -3936,7 +4088,7 @@ msgstr "Formulaire invalide"
 msgid "The form is not filled correctly."
 msgstr "Le forumlaire n'est pas correctement rempli."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4069,6 +4221,51 @@ msgstr ""
 "%s\n"
 "La messagerie en « link-local » pourrait ne pas fonctionner correctement."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+msgid "Could not request upload slot"
+msgstr "Impossible de demander l'envoi de fichier"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr "Réponse inattendue du serveur (voir log)"
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+msgid "Could not open file"
+msgstr "Impossible d'ouvrir le fichier"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr "Erreur lors de l'ouverture du fichier (voir log)"
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr "Non sécurisé"
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr "Le service a retourné un transport non sécurisé (http)"
+
+#: gajim/dialog_messages.py:162
+msgid "Could not upload file"
+msgstr "Impossible d'envoyer le fichier"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr "Code de réponse HTTP du serveur : %s"
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr "Erreur de l'envoi"
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr "Erreur du chiffrement"
+
+#: gajim/dialog_messages.py:173
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Aucune méthode disponible pour le chiffrement choisi"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Thème"
@@ -4093,7 +4290,15 @@ msgstr "Vous ne pouvez pas supprimer le thème actuellement utilisé"
 msgid "Pick another theme to use first."
 msgstr "Choisissez d'abord un autre thème à utiliser."
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+msgid "Merge Accounts"
+msgstr "Fusionner les comptes"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr "Utiliser un agent GPG"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Revient de suite."
 
@@ -4118,6 +4323,10 @@ msgstr ""
 "Toutes les fenêtres de conversation et de salons de discussion seront "
 "fermées. Voulez-vous continuer ?"
 
+#: gajim/accounts_window.py:344
+msgid "Remove"
+msgstr "Supprimer"
+
 #: gajim/accounts_window.py:387
 msgid "Rename account label"
 msgstr "Renommer le label du compte"
@@ -4290,47 +4499,59 @@ msgstr "Changer le mot de passe"
 msgid "Login Options"
 msgstr "Options de connexion"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus n'est pas présent sur cette machine"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Afficher l'aide pour une commande"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "commande"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "montrer l'aide sur la commande"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Montre ou cache la fenêtre principale"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 msgid "Lists all contacts in roster, one for each line"
 msgstr "Affiche tous les contacts de la liste, un par ligne"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+msgid "?CLI:account"
+msgstr "compte"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "montrer seulement les contacts du compte spécifié"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Affiche la liste des comptes enregistrés"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 msgid "Changes the status of account(s)"
 msgstr "Change l'état du ou des compte(s)"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+msgid "?CLI:status"
+msgstr "état"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4338,11 +4559,16 @@ msgstr ""
 "un parmi : offline, online, chat, away, xa, dnd, invisible. Si non défini, "
 "le précédant statut est utilisé"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+msgid "?CLI:message"
+msgstr "message"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "Message d'état"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4351,15 +4577,19 @@ msgstr ""
 "changer l'état de tous les compte qui ont l'option \"synchroniser avec "
 "l'état global\" activée"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 msgid "Changes the priority of account(s)"
 msgstr "Change la priorité du ou des compte(s)"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+msgid "?CLI:priority"
+msgstr "Priorité"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "priorité que vous voulez donner au compte"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4368,7 +4598,7 @@ msgstr ""
 "change la priorité de tous les comptes qui ont l'option « synchroniser avec "
 "l'état global » activée"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4378,29 +4608,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez seulement renseigner le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "L'identifiant Jabber du contact qui recevra le message"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "contenu du message"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr "Clé PGP"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Si spécifié, le message sera chiffré en utilisant cette clé publique"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
 "and account. If you want to only set the latter, set OpenPGP key to \"\"."
@@ -4409,119 +4639,119 @@ msgstr ""
 "sont facultatifs. Si vous voulez seulement renseigner le dernier paramètre, "
 "mettez simplement \"\" pour 'clé PGP'."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "sujet"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "sujet du message"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Envoie un nouveau message à un salon que vous avez rejoint."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "L'identifiant Jabber du salon qui recevra le message"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "L'identifiant Jabber du contact"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Récupère les informations détaillées d'un compte"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Nom du compte"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "fichier"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Liste toutes les préférences et leurs valeurs"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'clé' est le nom de l'option, 'valeur' est la valeur à assigner"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Supprime une option de préférence"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "touche"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nom de la préférence a supprimer"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Écrit les préférences actuelles de Gajim dans le fichier .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Enlever le contact de la liste"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Renvoie le message d'état actuel (global à moins qu'un compte ne soit "
 "spécifié)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Renvoie le nombre de messages non-lus"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Envoyer du XML personnalisé"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML à envoyer"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4529,15 +4759,15 @@ msgstr ""
 "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
 "à tous les comptes"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Modifier l'avatar"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Image à utiliser"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4545,19 +4775,19 @@ msgstr ""
 "Compte dans lequel l'avatar sera envoyé ; si non spécifié, l'avatar sera "
 "envoyé à tous les comptes"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Vérifie si Gajim est lancé"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Montre ou cache la fenêtre ipython"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4566,17 +4796,17 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Il semble que Gajim ne soit pas lancé. Vous ne pouvez donc pas utiliser "
 "gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4585,16 +4815,16 @@ msgstr ""
 "Utilisation : %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4607,7 +4837,7 @@ msgstr ""
 "\n"
 "commande est l'une de :\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4616,7 +4846,7 @@ msgstr ""
 "Trop d'arguments.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4790,11 +5020,6 @@ msgstr "Fin de la semaine"
 msgid "Weekend!"
 msgstr "Fin de semaine !"
 
-#: gajim/common/passwords.py:84
-#, python-format
-msgid "XMPP account %s"
-msgstr "Compte XMPP %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4819,52 +5044,52 @@ msgstr "Le salon de discussion a été détruit"
 msgid "You can join this room instead: %s"
 msgstr "Vous pouvez rejoindre le salon %s à la place"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erreur SSL inconnue : %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nouveau message simple de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nouveau message privé dans le salon %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Message de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nouveau message de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a changé d'état"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s s'est connecté(e)"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s s'est déconnecté(e)"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Pas dans la liste"
 
@@ -4892,7 +5117,7 @@ msgstr "Temps en minutes, au bout duquel votre état basculera absent(e)."
 
 #: gajim/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
-msgstr "$S (Absent(e) car inactif depuis plus de $T min)"
+msgstr "$S (Absent⋅e car inactif depuis plus de $T min)"
 
 #: gajim/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoawaytime."
@@ -5741,15 +5966,11 @@ msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée quand cela "
 "est possible ?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
-msgstr ""
-"Liste ordonnée de types de connexion, séparés par des virgules, à essayer. "
-"Peut contenir tls, ssl ou plain."
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
+msgstr "Autoriser les connexions non chiffrées"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
@@ -5759,7 +5980,7 @@ msgstr ""
 "Peut contenir ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, "
 "DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 ou XEP-0078"
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -5768,24 +5989,24 @@ msgstr ""
 "connexion non-chiffrée. Peut prendre les valeurs 'warn', 'connect', "
 "'disconnect'"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Afficher un message d'avertissement avant d'utiliser la librairie SSL "
 "standard."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Afficher un message d'avertissement avant d'envoyer un mot de passe non-"
 "chiffré via une connexion non-chiffrée."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Liste d'erreurs ssl, séparées par une virgule, à ignorer."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
@@ -5794,7 +6015,7 @@ msgstr ""
 "enregistrer les conversations. Vous pouvez également ajouter le nom d'un "
 "compte pour ne rien enregistrer pour ce compte."
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
@@ -5802,7 +6023,7 @@ msgstr ""
 "Au démarrage, Gajim téléchargera l'historique stocké sur le serveur, si le "
 "serveur supporte la XEP-0313"
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
@@ -5810,15 +6031,15 @@ msgstr ""
 "Liste de jid, séparée par un espace, pour lesquels vous accepter de ne pas "
 "enregistrer les conversations s'il ne veut pas."
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Espace envoyée après inactivité"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "ping XMPP envoyé après inactivité"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
@@ -5826,11 +6047,11 @@ msgstr ""
 "Nombre de secondes d'attente pour la réponse du Paquet d'Entretien de "
 "Connexion avant de tenter de se connecter ?"
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Contournement de bug de jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5838,7 +6059,7 @@ msgstr ""
 "Si cette case est cochée, Gajim utilisera votre IP et les proxies définis "
 "dans l'option file_transfer_proxies pour les transferts de fichiers."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
@@ -5847,26 +6068,26 @@ msgstr ""
 "être sûr qu'ils fonctionnent. Les proxys de Openfire sont connus pour "
 "échouer à ce test, même s'ils fonctionnent"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Répondre aux demandes d'accusés de réception"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Envoyer des demandes d'accusés de réception"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Si cette case est cochée, Gajim autorisera les autres à détecter le système "
 "d'exploitation que vous utilisez"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "Autorise Gajim à envoyer votre heure."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5874,11 +6095,11 @@ msgstr ""
 "Durant la négociation d'une session chiffrée, Gajim doit-il partir du "
 "principe que vous voulez archiver vos conversations ?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "Message à envoyer aux contacts que vous souhaitez ajouter"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
@@ -5886,7 +6107,7 @@ msgstr ""
 "Si activé et si le serveur supporte cette fonctionnalité, Gajim recevra les "
 "messages envoyés et reçus par les autres resources."
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
@@ -5894,19 +6115,19 @@ msgstr ""
 "Si activé, Gajim enverra vos IPs publiques pour que vos contacts puissent se "
 "connecter à votre machine pour les transfert de fichiers."
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Dernier jeton pour l'authentification OAuth 2.0."
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "client_id pour l'authentification OAuth 2.0."
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "redirect_url pour l'authentification OAuth 2.0."
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
@@ -5914,15 +6135,27 @@ msgstr ""
 "Liste de jid, séparée par un espace, pour lesquels vous voulez rouvrir la "
 "fenêtre de discussion au prochain démarrage."
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr "Envoie par HTTP : Activer la vérification HTTPS"
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+"Mécanisme de transfert préféré pour le cliquer-déposer sur une fenêtre de "
+"discussion. Peut être 'httpupload' (par défault) ou 'jingle'"
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Langue dans laquelle faire la vérification orthographique"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr "Chiffrement actuellement actif pour ce contact"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
@@ -5930,7 +6163,7 @@ msgstr ""
 "Le nombre de lignes d'archives qui seront demandées en entrant dans un "
 "salon. -1 signifie \"pas de limitation\", -2 signifie \"valeur globale\""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
@@ -5938,11 +6171,11 @@ msgstr ""
 "Le nombre de minutes d'archives qui seront demandées en entrant dans un "
 "salon. -1 signifie \"pas de limitation\", -2 signifie \"valeur globale\""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr "Indique si l'on veut une notification pour chaque message de ce salon"
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
@@ -5952,79 +6185,79 @@ msgstr ""
 "s'eteint). Cette option NE DEVRAIT PAS être utilisée pour (dés)activer un "
 "plugin. Utiliser l'interface graphique pour cela."
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dort"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Mange"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Travaille"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Téléphone"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Dehors"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Je suis sorti profiter de la vie."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Disponible"
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Ne pas déranger."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Au revoir !"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6032,27 +6265,27 @@ msgstr ""
 "Son à jouer lorsqu'un message de salon contient un des mots de "
 "muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son émis lors de l'arrivée d'un message de salon de discussion."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "vert"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "épicerie"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "Humain"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "Marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 msgid "Tor"
 msgstr "Tor"
 
@@ -6129,36 +6362,49 @@ msgstr "Tous les messages non-lus ont été transmis."
 msgid "Forward unread message then disconnect"
 msgstr "Transférer les messages non-lus et se déconnecter"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Le fichier est vide"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Le fichier n'existe pas"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr "Fichier trop gros, la taille maximum autorisée est : %s"
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "création de la base de donnée de cache"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Déplacement de %(src)s vers %(dst)s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s est un fichier mais devrait être un répertoire"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s est un répertoire mais devrait être un fichier"
@@ -6168,11 +6414,11 @@ msgstr "%s est un répertoire mais devrait être un fichier"
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migration de la base de données de l'historique vers des index"
 
@@ -6181,191 +6427,191 @@ msgstr "migration de la base de données de l'historique vers des index"
 msgid "%s is not a valid loglevel"
 msgstr "%s n'est pas un loglevel valide"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Impossible d'obtenir le certificat de l'émetteur"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Impossible d'obtenir un certificat CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Impossible de déchiffrer la signature du certificat"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Impossible de déchiffrer la signature du CRL"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de déchiffrer la clef public de l'émetteur"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Échec de la signature du certificat"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Échec de la signature CRL"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Le certificat n'est pas encore valide"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Le certificat a expiré"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL n'est pas encore valide"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL a expiré"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Erreur de format dans le champ notBefore du certificat"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Erreur de format dans le champ notAfter du certificat"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erreur de format dans le champ lastUpdate du CRL"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erreur de format dans le champ nextUpdate du CRL"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Mémoire insuffisante"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Certificat auto-signé"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificat auto-signé dans la chaîne de certificat"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Impossible de récupérer le certificat de l'émeteur local"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Impossible de vérifier le premier certificat"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Chaîne du certificat trop longue"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certificat révoqué"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Certificat CA invalide"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Longueur du chemin dépassée"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Objet du certificat non-supporté"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certificat non approuvé"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certificat refusé"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Décalage du sujet de l'émetteur"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Décalage dans les clés d'identification de l'authorité et du sujet"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Décalage dans les numéros de série de l'authorité et du sujet"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "L'utilisation de la clé n'inclut pas la signature d'un certificat"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Echec de la vérification de l'application"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Reconnecter manuellement."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Le serveur %(name)s a mal répondu à la requête d'enregistrement : %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Le serveur %s a fourni une forme d'inscription différente"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Impossible de se connecter à \"%(host)s\" via le proxy \"%(proxy)s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Impossible de se connecter à \"%(host)s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "le serveur a répondu : %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "La connexion au proxy a échoué"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossible de se connecter au compte %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "La connexion avec le compte %s a été perdue. Essayez de vous connecter à "
 "nouveau."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "L'authentification du certificat %s peut être invalide"
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6374,7 +6620,7 @@ msgstr ""
 "\n"
 "Erreur SSL : <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6383,7 +6629,7 @@ msgstr ""
 "\n"
 "Erreur SSL inconnue : %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -6392,31 +6638,31 @@ msgstr ""
 "L'authentification du certificat %s peut être invalide.\n"
 "Le certificat ne couvre pas ce domaine."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Contact envoyé : « %(jid)s » (%(name)s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Contacts envoyés :"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Non récupéré à cause du statut invisible"
 
@@ -7287,234 +7533,258 @@ msgstr "Entrée vidéo"
 msgid "video output"
 msgstr "Sortie audio"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Le serveur doit comprendre entre 1 et 1023 octets"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Caractère non valide dans le nom d'hôte."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Adresse du serveur requise."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Le nom d'utilisateur doit comprendre entre 1 et 1023 octets"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Caractère non valide dans le nom d'utilisateur."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "La ressource doit comprendre entre 1 et 1023 octets"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "O_ccupé(e)"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "?user status:_Disponible"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Connexion"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
-msgstr "_Absent(e)"
+msgstr "_Absent⋅e"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "Déc_onnecté(e)"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Inconnu"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "en erreur"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Aucune"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "À"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Les deux"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Aucune"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Aucun"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Participants"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Participant"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 msgid "is composing a message…"
 msgstr "écrit un message…"
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gio"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mio"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s Kio"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message en attente"
 msgstr[1] "%d messages en attente"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, python-format
 msgid "from room %s"
 msgstr "du salon %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr "de l'utilisateur %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, python-format
 msgid "from %s"
 msgstr "de %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d évènement en attente"
 msgstr[1] "%d événements en attente"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "Bonjour, je m'appelle $name."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Délai du chargement de l'image dépassé"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr "PyCURL n'est pas installé"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 msgid "Error loading image"
 msgstr "Erreur lors du chargement de l'image"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr "Ce message a été chiffre avec OTR et ne peux pas être déchiffré."
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -7522,23 +7792,23 @@ msgstr ""
 "Ce message a été chiffre avec l'ancien OpenPGP et ne peux pas être "
 "déchiffré. Vous pouvez installer le plugin PGP pour gérer ces messages."
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 "Ce message a été chiffre avec OpenGPG pour XMPP et ne peux pas être "
 "déchiffré."
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr "Ce message a été chiffre avec %s et ne peux pas être déchiffré."
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "message"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
@@ -7576,43 +7846,43 @@ msgstr ""
 "Le bus de session n'est pas disponible.\n"
 "Essayer en lisant %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Veuillez vérifier si Avahi ou Bonjour sont installés."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Impossible de lancer le service local"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de débloquer le port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Vérifiez si avahi-daemon est actif."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossible de changer l'état du compte « %s »"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Votre message n'a pas pu être envoyé."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Le destinataire est déconnecté. Votre message n'a pas pu être envoyé."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7849,6 +8119,10 @@ msgstr "_Bannir"
 msgid "_Add to Roster"
 msgstr "_Ajouter à la liste de contacts"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+msgid "_Execute command"
+msgstr "_Exécuter une commande"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8122,11 +8396,11 @@ msgstr "À propos"
 msgid "Con_tinue"
 msgstr "Con_tinuer"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pause"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Annuler"
@@ -8135,32 +8409,32 @@ msgstr "_Annuler"
 msgid "_Open Containing Folder"
 msgstr "_Ouvrir le répertoire de destination"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Transfert de fichiers"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "liste des transferts de fichier"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Une liste des transferts de fichier actifs, terminés et arrêtés"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Nettoyer"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Supprimer les transferts de fichier terminés, annulés et échoués de la liste"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Supprimer le transfert de fichier de la liste."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8168,35 +8442,39 @@ msgstr ""
 "Cette action supprime les transferts de fichier de la liste. Si le transfert "
 "est actif, il est d'abord arrêté puis supprimé"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Annule le transfert du fichier sélectionné et supprime les fichiers "
 "incomplets"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Annule le transfert de fichier"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Annule le transfert du fichier sélectionné"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+msgid "_Close"
+msgstr "_Fermer"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Cache la fenêtre"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "Me _signaler quand un transfert de fichier est terminé"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Quand le transfert de fichier est terminé, montrer une fenêtre de "
 "notification"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Affiche une liste des transferts de fichiers entre vous et les autres"
 
@@ -8205,7 +8483,7 @@ msgid "Register to"
 msgstr "S'enregistrer à"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8235,19 +8513,19 @@ msgstr "Police"
 msgid "Clear formatting"
 msgstr "Effacer le formatage"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Afficher une liste des émoticônes (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 msgid "Choose an encryption"
 msgstr "Choisir un chiffrement"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Afficher une liste des émoticônes (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "Type d'événement"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "Événement"
 
@@ -8299,7 +8577,7 @@ msgstr "<b>0</b>"
 msgid "<b>#</b>"
 msgstr "<b>#</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -8623,8 +8901,8 @@ msgstr ""
 #: gajim/data/gui/preferences_window.ui:681
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
-"Autoriser les _notifications lorsque je suis absent(e)/indisponible/"
-"occupé(e)/invisible"
+"Autoriser les _notifications lorsque je suis absent⋅e/indisponible/occupé⋅e/"
+"invisible"
 
 #: gajim/data/gui/preferences_window.ui:698
 msgid "Allow popup/notifications when a chat window is opened"
@@ -8699,13 +8977,13 @@ msgstr "Événements Personnels"
 
 #: gajim/data/gui/preferences_window.ui:1043
 msgid "_Away after:"
-msgstr "Passer _Absent(e) après :"
+msgstr "Passer _Absent⋅e après :"
 
 #: gajim/data/gui/preferences_window.ui:1047
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
-"Si cette case est cochée, Gajim changera votre statut en Absent(e) quand "
+"Si cette case est cochée, Gajim changera votre statut en Absent⋅e quand "
 "l'ordinateur est inutilisé."
 
 #: gajim/data/gui/preferences_window.ui:1060
@@ -8826,7 +9104,7 @@ msgid ""
 msgstr ""
 "Si cette case est cochée, Gajim utilisera des icônes d'état spécifiques aux "
 "protocoles. (Par ex. un contact ICQ aura les icônes de ICQ pour les états "
-"disponible, absent(e), occupé(e), etc.)"
+"disponible, absent⋅e, occupé⋅e, etc.)"
 
 #: gajim/data/gui/preferences_window.ui:1660
 msgid "Configure color and font of the interface"
@@ -9036,10 +9314,6 @@ msgstr "_Ouvrir..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Éditeur de configuration avancée</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avancées"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Commencer une _discussion"
@@ -9278,7 +9552,7 @@ msgid "_Open Email Composer"
 msgstr "_Ouvrir le logiciel de courriel"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "Commencer une _discussion"
 
@@ -9320,6 +9594,10 @@ msgstr "Préférence"
 msgid "Default:"
 msgstr "Par défaut :"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr "<b><big>Appel entrant</big></b>"
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Ajouter un nouveau contact"
@@ -9345,6 +9623,14 @@ msgstr "_Surnom :"
 msgid "_Group:"
 msgstr "_Groupe :"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+msgid "Type User ID"
+msgstr "Taper l'identifiant"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+msgid "Type Nickname"
+msgstr "Taper le pseudonyme"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr "Choisissez un groupe ou tapez un nouveau groupe"
@@ -9381,6 +9667,10 @@ msgstr ""
 "Vous devez être connecté à la passerelle pour\n"
 "pouvoir ajouter un contact de ce protocole."
 
+#: gajim/data/gui/roster_window.ui:61
+msgid "Change Status Message…"
+msgstr "Changer le message d'état…"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Humeur :</b>"
@@ -9596,10 +9886,9 @@ msgstr "_Exécuter une commande..."
 msgid "_Verify"
 msgstr "_Vérifier"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Comptes"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(Information sur l'<b>ESession</b>)"
 
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
@@ -9621,10 +9910,6 @@ msgstr "Afficher les contacts actifs"
 msgid "Show Transports"
 msgstr "Afficher les passerelles"
 
-#: gajim/data/gui/application_menu.ui:32
-msgid "File Transfer"
-msgstr "Transfert de fichiers"
-
 #: gajim/data/gui/application_menu.ui:43
 msgid "Help"
 msgstr "Aide"
@@ -9689,34 +9974,23 @@ msgstr "_Minimiser automatiquement"
 msgid "Pr_int status:"
 msgstr "_Afficher l'état :"
 
-# ccount). Description column
-#: gajim/data/gui/exception_dialog.ui:7
-msgid "Exception"
-msgstr "Exception"
-
-#: gajim/data/gui/exception_dialog.ui:44
-msgid "Report Bug"
-msgstr "Rapport de bogue"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
-"Une erreur de programmation a été détectée.\n"
-"Ce n'est probablement pas fatal, mais devrait\n"
-"tout de même être reporté aux développeurs."
+"Une erreur de programmation a été détectée. Ce n'est probablement pas fatal, "
+"mais devrait tout de même être reporté aux développeurs."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Requête d'Inscription"
+#: gajim/data/gui/exception_dialog.ui:115
+msgid "Report Bug"
+msgstr "Rapport de bogue"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Refuser"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9724,16 +9998,11 @@ msgstr ""
 "Refuser l'autorisation au contact pour qu'il ne puisse pas savoir quand vous "
 "êtes connecté"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "Act_ions"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_toriser"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autoriser le contact à savoir quand vous êtes connecté"
 
@@ -9749,11 +10018,11 @@ msgstr "iq"
 msgid "Presets"
 msgstr "Préréglages"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Inviter des Amis !"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
@@ -9761,15 +10030,20 @@ msgstr ""
 "Vous allez entrer dans un salon de discussion.\n"
 "Sélectionnez les contacts que vous voulez inviter"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr "colonne"
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Veuillez choisir un serveur de Salons de Discussion."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Serveur de salon"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_viter"
 
@@ -9880,10 +10154,6 @@ msgstr "Défilement haut"
 msgid "Scroll down"
 msgstr "Défilement bas"
 
-#: gajim/data/gui/shortcuts_window.ui:113
-msgid "Clear"
-msgstr "Effacer"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr "Onglets"
@@ -10034,6 +10304,14 @@ msgstr "Montrer les _événements en attente"
 msgid "Mute Sounds"
 msgstr "Désactiver les sons"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+msgid "_Preferences"
+msgstr "_Préférences"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr "_Quitter"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "À :"
@@ -10449,14 +10727,6 @@ msgstr "Remplacer ?"
 msgid "Configuration"
 msgstr "Configuration"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr "Ouvrir une URI avec Gajim"
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr "discussion;messagerie;messagerie instantanée;jabber;xmpp;bonjour;voip;"
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Client de Messagerie Instantanée Jabber"
@@ -10586,6 +10856,38 @@ msgstr "Historique des discussions"
 msgid "Plugin manager"
 msgstr "Gestionnaire de plugins"
 
+#~ msgid "XMPP account %s"
+#~ msgstr "Compte XMPP %s"
+
+# ccount). Description column
+#~ msgid "Exception"
+#~ msgstr "Exception"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>%(jid)s</b> aimerait que vous <b>%(action)s</b> quelques contacts dans "
+#~ "votre liste."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Liste ordonnée de types de connexion, séparés par des virgules, à "
+#~ "essayer. Peut contenir tls, ssl ou plain."
+
+#~ msgid "_Actions"
+#~ msgstr "Act_ions"
+
+#~ msgid "Open URI using Gajim"
+#~ msgstr "Ouvrir une URI avec Gajim"
+
+#~ msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+#~ msgstr ""
+#~ "discussion;messagerie;messagerie instantanée;jabber;xmpp;bonjour;voip;"
+
 #~ msgid "UPower"
 #~ msgstr "UPower"
 
@@ -10797,12 +11099,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Cache les boutons de discussion."
 
-#~ msgid "File is empty"
-#~ msgstr "Le fichier est vide"
-
-#~ msgid "File does not exist"
-#~ msgstr "Le fichier n'existe pas"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10832,55 +11128,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "Nécessite python-pyopenssl > 0.12 et pyasn1."
 
-#~ msgid "?user status:_Available"
-#~ msgstr "?user status:_Disponible"
-
-#~ msgid "?user status:Available"
-#~ msgstr "?user status:Disponible"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Inconnu"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "en erreur"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Aucune"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Aucune"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Aucun"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Group Chat Contact Affiliation:Aucune"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Tout"
-
-#~ msgid "?print_status:None"
-#~ msgstr "Aucun"
-
-#~ msgid "?features:Available"
-#~ msgstr "?features:Disponible"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "compte"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "état"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "message"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Priorité :"
-
 #, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "groupe de discussion"
@@ -10894,33 +11141,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgstr "mot de passe"
 
 #, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Salons de discussion"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Télécharger"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Envoyer"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:En pause"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Inconnu"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Inconnu"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Date:Inconnue"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "<b>Role :</b>"
-
-#, fuzzy
 #~ msgid "Credentials"
 #~ msgstr "Certificat Oauth2"
 
@@ -11136,9 +11356,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "Choose _Key..."
 #~ msgstr "Choisissez une _clé..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Utiliser un Agent G_PG"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11283,17 +11500,6 @@ msgstr "Gestionnaire de plugins"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Entrée XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtre :"
-
-#~ msgid "XML Input"
-#~ msgstr "Entrée XML"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "En_voyer"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Console XML pour %s"
 
diff --git a/po/gl.po b/po/gl.po
index 024450220..eb09c36f0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:51+0200\n"
 "Last-Translator: Iván Méndez López <>\n"
 "Language-Team:  <softwarelibre@udc.es>\n"
@@ -30,20 +30,20 @@ msgstr ""
 msgid "Error."
 msgstr "Erro de Avahi"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -89,72 +89,72 @@ msgstr "Hora"
 msgid "Progress"
 msgstr "Progreso"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Vostede"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Remitente: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gardouse en: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Abrir un cartafol de contido"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Cancelouse a transferencia do ficheiro"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Non se puido estabelecer a conexión co cliente."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -162,128 +162,128 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Elixa un ficheiro para enviar..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Enviar"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Descrición: %s"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "O Gajim non pode acceder a este ficheiro"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non se pode sobrescribir o ficheiro existente \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Xa existe un ficheiro con este nome e non ten permiso para o sobreescribir"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Este ficheiro xa existe"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Que quere facer?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Non se pode escribir no directorio \"%s\""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Non ten autorización para crear ficheiros neste directorio."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Gardar o ficheiro como..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Descrición: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quere enviarlle un ficheiro:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "A enviar o perfil..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "O ficheiro non é válido"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Nome: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pausa"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -443,47 +443,69 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "En líña"
+
 #: gajim/features_window.py:101
 #, fuzzy
 msgid "Feature"
 msgstr "Características dos servidores"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Erro ao ler o ficheiro:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Erro ao analizar o ficheiro:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Extensión non admitida"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "A imaxe non se puido gardar no formato %(type)s. Desexa gardar como "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Gardar a imaxe como..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Ten "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Descoñecido"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Descoñecido"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Descoñecido"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programas</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -492,7 +514,7 @@ msgstr ""
 "Este contacto está interesado na información da súa presenza, mais vostede "
 "non o está na súa"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -501,14 +523,14 @@ msgstr ""
 "Está interesado na información da presenza do contacto, mais el/ela non o "
 "está en vostede"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Tanto vostede como o contacto están interesados na información da presenza "
 "do outro"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -517,28 +539,38 @@ msgstr ""
 "Tanto vostede como o contacto están interesados na información da presenza "
 "do outro"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Está a agardar a resposta do contacto sobre a súa solicitude de subscrición"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Todos os ficheiros"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Serán"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Xestionar os perfís do proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -583,13 +615,13 @@ msgid "_New Group Chat"
 msgstr "Novo grupo de charla"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Non está na listaxe"
 
@@ -602,7 +634,7 @@ msgstr "Gustaríame engadilo á miña listaxe de contactos"
 msgid "Send Single _Message…"
 msgstr "Enviar mensaxe"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 #, fuzzy
 msgid "Send Cus_tom Status"
@@ -623,25 +655,25 @@ msgstr "Transportes"
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "Renomear"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 #, fuzzy
 msgid "Remo_ve"
@@ -657,204 +689,224 @@ msgstr "Información"
 msgid "Send File..."
 msgstr "Enviar ficheiro"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Contactos"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Engadir á listaxe de contactos"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Información"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historial"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Xestionar os marcadores"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Cambiar o _tema"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Configurar a sala"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Descrición: %s"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Cambiar o _alcume"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Engadir esta sala aos marcadores"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Mensaxes predefinidas:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "Executar o _comando..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Contacto desconectado"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Engadir un contacto..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "ficheiro"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Descubrir os servizos"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Enviar unha _mensaxe..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferencias"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Amosar os contactos desconectados"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Administrar"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Enviar a mensaxe do servidor"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Definir a MDD"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Actualizar a MDD"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Eliminar MDD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "A conta non está dispoñíbel"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Contas"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "mensaxe"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Emoticonas:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Alcume"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mensaxe"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Asunto"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -862,7 +914,7 @@ msgstr ""
 "Quere limpar a base de datos? (TOTALMENTE DESACONSELLADO SE GAJIM ESTÁ EN "
 "EXECUCIÓN)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -877,99 +929,99 @@ msgstr ""
 "\n"
 "Caso de elixir SI, por favor, agarde..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "A exportar o historial..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dixo: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr ""
 "Está seguro de que quere eliminar o historial do contacto que seleccionou?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "O servizo non se achou"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Información"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 msgstr[1] "Está seguro de que quere eliminar as mensaxes que seleccionou?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Esta é unha operación irreversíbel"
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "A recuperar o perfil..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Información"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Información recibida"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Sen unha conexión non pode publicar a súa información de contacto."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "A enviar o perfil..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Información NON publicada"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Fallou a publicación da vCard"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -987,10 +1039,10 @@ msgstr "Nome do contacto : <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Xeral"
@@ -1083,37 +1135,37 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "A ID de usuario non é válida"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario non contén un recurso."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "O contacto xa está na listaxe"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1121,61 +1173,61 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Un cliente de Jabber de GTK"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Versión de GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Versión de PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Desenvolvedores actuais:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Desenvolvedores anteriores:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Por último mais non menos importante, queremos agradecerlles a todos os "
 "mantedores de paquetes."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Non está dispoñíbel o dicionario para o idioma %s"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1186,13 +1238,13 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Conexión"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1201,507 +1253,531 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Non me preguntar outra vez"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Solicitude de subscrición"
+
+#: gajim/dialogs.py:2284
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitude de subscrición para a conta %s de %s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitude de subscrición de %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Entrar nunha sala de charlas"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "A entrada non é válida"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Crear unha publicación nova"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "A ID de Jabber non é válida"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Host errado"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Isto non é un grupo de charla"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nome"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Servidor"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Conexión"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Novo grupo de charla"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Engadir un contacto novo"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "O contrasinal non é válido"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Debe introducir un contrasinal."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Mensaxe nova"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Mensaxe nova"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Mensaxe privada nova"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Convite a grupo de charla"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Mensaxe:"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Estou %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Serán"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtro:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Entrada de XML</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Enviar"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Atascado"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "_Modificar"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Eliminar"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 #, fuzzy
 msgid "Add"
 msgstr "Enderezo"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Eliminar"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Engadir un _contacto"
 msgstr[1] "Engadir un _contacto"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Elimina o contacto da listaxe"
 msgstr[1] "Elimina o contacto da listaxe"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Preferencias"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Recibiu unha entrada nova:"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Erro de Avahi"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "ID de Jabber:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Listaxe de privacidade <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Listaxe de privacidade"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orde: %s, acción: %s, tipo: %s, valor: %s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orde: %s, acción: %s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listaxes de privacidade para %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "O nome de listaxe non é válido"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Debe introducir un nome para crear unha listaxe de privacidade."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Elixir un son"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Elixir unha imaxe"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Imaxes"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Elixir unha imaxe"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Todos os ficheiros"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cando %s estea:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "para a conta %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1725,336 +1801,374 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Transferencias"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Cifrado desactivado"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s coñéceselle como %s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Quer xa non está no grupo de charla \"%s\" quer \"%s\" esta xa non existe."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "O teu servidor non admite o almacenamento de metacontactos"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrición: %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afiliación:"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s saíu"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se pecha esta fiestra, desconectaráselle deste grupo de charla."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Transferencias"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Transferencias"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2062,7 +2176,7 @@ msgstr ""
 "Se pecha este separador e ten o historial desactivado, esta mensaxe "
 "perderase."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2071,106 +2185,106 @@ msgstr ""
 "Asunto: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Transferencias"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Tamaño: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceptar"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Entrar"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro ao ler o ficheiro:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 #, fuzzy
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Enviouse a autorización"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" acepta esta solicitude, poderá saber o seu estado."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Eliminouse a autorización"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2178,11 +2292,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar nun ou máis grupos de charlas"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2190,39 +2304,39 @@ msgstr ""
 "Ao cambiar o seu estado a invisíbel provocará a súa desconexión dos grupos "
 "de charla. Está seguro de que quere ser invisíbel?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar a transferencia"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -2231,16 +2345,16 @@ msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -2248,11 +2362,11 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2261,68 +2375,68 @@ msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: "
 "%s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Quere eliminar o grupo %s da listaxe?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Eliminar da listaxe tamén todos os contactos dentro do grupo"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Asignar chave de OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Seleccione unha chave para lle aplicar ao contacto"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2332,12 +2446,12 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2346,15 +2460,15 @@ msgstr ""
 "Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
 "sempre o/a verá desconectado."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto coñeza o meu estado despois da eliminación"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Os contactos eliminaranse da súa listaxe"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2364,37 +2478,37 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2403,12 +2517,12 @@ msgstr ""
 "O seu servidor non admite almacenar información de metacontactos. Por tanto, "
 "toda a información referente non se gardará na próxima reconexión."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2418,199 +2532,199 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s quere enviarlle un ficheiro:"
 msgstr[1] "%s quere enviarlle un ficheiro:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Facer %s e %s metacontactos"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Facer %s e %s metacontactos"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "_Descubrir os servizos..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vidar"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar os grupos"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto desconectado"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto desconectado"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historial"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Historial"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Cambiar a mensaxe de estado"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar a icona na á_rea de notificación"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Amosar só na _listaxe de contactos"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor avanzado de configuración"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuración da sala"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Amosar todos os _eventos pendentes"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Que quere facer?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "%d mensaxe sen ler"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2619,7 +2733,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2627,7 +2741,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2775,16 +2889,16 @@ msgstr "Cifrado desactivado"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
@@ -2816,10 +2930,19 @@ msgstr "Eliminar a _conta unicamente do Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "Todos"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Entrar e saír soamente"
 
+#: gajim/config.py:1949
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Todos"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Novo grupo de charla"
@@ -2890,12 +3013,12 @@ msgstr "A entrada non é válida"
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "O contacto xa está na listaxe"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2994,92 +3117,115 @@ msgstr "Remarcado da mensaxe de grupo de charla"
 msgid "Group Chat Message Received"
 msgstr "Recibiuse unha mensaxe de grupo de charla"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s deste grupo de charla"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Ningún"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrador"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Propietario"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 #, fuzzy
 msgid "Connected"
 msgstr "Conexión"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto desconectado"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Descarga"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Subida"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Tipo: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Detido"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Completado"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Pausada"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Atascado"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "A transferir"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Estado: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Pausada"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Ausente"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -3131,125 +3277,129 @@ msgstr "(Ningún)"
 msgid "Hidden"
 msgstr "Oculta"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historial de conversas con %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historial de conversas"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s "
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "a usar a conta %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Xestionar os marcadores"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Non está na listaxe"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Amosar _listaxe"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Extensión non admitida"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Nome do host:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Características dos servidores"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Gardouse en: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3411,7 +3561,7 @@ msgstr "_Engadir"
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -3420,52 +3570,58 @@ msgstr ""
 "O texto que está debaixo desta liña foi o que se dixo desde a última vez que "
 "lle prestou atención a esta sala de charla"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "_Saír"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" no URL do dicionario e non está no WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "A ID de Jabber non é válida"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3477,32 +3633,37 @@ msgstr[1] "Onte"
 msgid "Write a message.."
 msgstr "Mensaxe privada nova"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non está conectado ao servidor"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Grupos de charla"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3514,273 +3675,278 @@ msgstr ""
 "ocupante. \n"
 "Por favor, especifique outro alcume abaixo:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acepta esta solicitude?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "É necesario un contrasinal para entrar a este grupo de charla."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Sons</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Está expulsado deste grupo de charla."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "A creación de grupos de charla está restrinxida."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "É necesario usar o alcume rexistrado."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non está na listaxe de membros"
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizouno para ver o seu estado."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Comprobe a súa conexión ou probe máis tarde."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está actualmente conectado sen a súa chave de GPG"
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Elixa a súa chave de OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferencias"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Detívose a transferencia do ficheiro %(filename)s de %(name)s."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Envioulle con éxito o ficheiro %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Elixa un ficheiro para enviar..."
+
+#: gajim/gui_interface.py:1196
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En cada _mensaxe"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3788,7 +3954,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3798,15 +3964,15 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3821,46 +3987,46 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Isto non é un grupo de charla"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifrado desactivado"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3868,42 +4034,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Selección da chave de OpenPGP"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
@@ -3975,6 +4141,11 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4008,7 +4179,7 @@ msgid "The form is not filled correctly."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Invisíbel"
 
@@ -4138,6 +4309,56 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Non foi posíbel iniciar o servizo local"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Non foi posíbel cargar a imaxe"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Non foi posíbel cargar a imaxe"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Cifrado activado"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Non está dispoñíbel ningunha conexión"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4164,7 +4385,16 @@ msgstr "Non pode eliminar o tema actual"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Contas combinadas"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr ""
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Volvo axiña"
 
@@ -4187,6 +4417,11 @@ msgstr "Comezou unha charla coa conta %s"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Eliminar"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4381,52 +4616,66 @@ msgstr "Cambiar o contrasinal"
 msgid "Login Options"
 msgstr "Emoticonas:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus non está presente nesta máquina ou falta o módulo python"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Amosa axuda sobre un comando específico"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "comando"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "amosar axuda sobre un comando"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Amosa unha listaxe de todos os contactos na listaxe. Cada contacto aparece "
 "nunha liña distinta"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "conta"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "amosar só contactos da conta especificada"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Amosa unha listaxe de contas que están rexistradas"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "estado"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4435,11 +4684,17 @@ msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mensaxe"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "mensaxe de estado"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4448,17 +4703,22 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Pr_ioridade:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quero _rexistrar unha conta nova de Jabber"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4468,7 +4728,7 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4478,29 +4738,29 @@ msgstr ""
 "OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "contido da mensaxe"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se se especifica, a mensaxe cifrarase mediante a súa chave pública"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "se se especifica, a mensaxe enviarase a través desta conta"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4510,125 +4770,125 @@ msgstr ""
 "OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Obter información detallada dun contacto"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "ficheiro"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "a 'entrada' é o nome da preferencia, o 'valor' é o do valor para definir"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "entrada"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe o estado actual da preferencias do Gajim para o ficheiro de "
 "configuración"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se se especifica, o contacto obtense da listaxe desta conta"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devolve o estado actual (o global se non se especificar unha conta)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devolve a mensaxe de estado actual (o global se non se especificar unha "
 "conta)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Devolve o número de mensaxes sen ler"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML para enviar"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4637,17 +4897,17 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Un contacto cambiou o seu estado"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Non se achou o alcume: %s"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4656,21 +4916,21 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4679,31 +4939,31 @@ msgstr ""
 "'%s' non está na súa listaxe de contactos.\n"
 "Por favor, especifique unha conta para enviar a mensaxe."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4714,7 +4974,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4723,7 +4983,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4897,11 +5157,6 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "da conta %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4927,52 +5182,52 @@ msgstr "Eliminouse a autorización"
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensaxe privada desde o grupo de charlas %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambiou o seu estado"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectouse"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectouse"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 #, fuzzy
 msgid "Not in roster"
 msgstr "Non está na listaxe"
@@ -5769,75 +6024,73 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5845,179 +6098,189 @@ msgstr ""
 "Se isto está marcado, o Gajim usará o seu IP e proxies que se definen na "
 "opción file_transfer_proxies para a súa transferencia."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Usar a autenticación"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Usar a autenticación"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Usar a autenticación"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingua en que se comprobarán os erros ortográficos"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, déixeme unha mensaxe."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "A traballar"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Teléfono"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Fóra"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6026,27 +6289,27 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "verde"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "ultramariño"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "humano"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "mariño"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "A"
@@ -6135,37 +6398,52 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr "%d mensaxe sen ler"
 
+#: gajim/common/httpupload.py:137
+#, fuzzy
+msgid "File is empty"
+msgstr "Camiño do ficheiro"
+
+#: gajim/common/httpupload.py:140
+#, fuzzy
+msgid "File does not exist"
+msgstr "Non existe o grupo de charla."
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "a crear a base de datos de rexistros"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "a crear a base de datos de rexistros"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Enviar %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é un ficheiro mais podería ser un directorio"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim pecharase agora"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é un directorio mais podería ser un ficheiro"
@@ -6175,11 +6453,11 @@ msgstr "%s é un directorio mais podería ser un ficheiro"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: non se pode abrir %s para lectura"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "ciano"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrando os rexistros da base de datos aos índices"
@@ -6189,239 +6467,239 @@ msgstr "migrando os rexistros da base de datos aos índices"
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "O nome de usuario non é válido"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Non se pode conectar a \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Non se pode conectar a \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Gardouse en: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Fallou a conexión"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non se pode conectar a \"%s\""
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non se pode conectar a \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Fallou a autenticación con \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprobe que o seu nome de usuario e o seu contrasinal sexan os "
 "correctos."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contactos"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Non se conseguiu debido ao estado invisíbel"
 
@@ -7353,255 +7631,280 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Carácter non válido no nome do host."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "É necesario o enderezo do servidor."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Hai un caracter non válido no nome de usuario."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "Pausada"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Descoñecido"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Ten erros"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Ningunha"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Ningunha"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Ningún"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está a escribir..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar a mensaxe"
 msgstr[1] "Enviar a mensaxe"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "Estou %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "A información de rexistro para o transporte %s non chegou a tempo"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "mensaxe"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
@@ -7637,45 +7940,45 @@ msgstr ""
 "O bus da sesión non está dispoñíbel.\n"
 "Probe a ler http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Non foi posíbel ligar ao porto %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Non foi posíbel cambiar o estado da conta \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7928,6 +8231,11 @@ msgstr "_Deshabilitar"
 msgid "_Add to Roster"
 msgstr "_Engadir á listaxe de contactos"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "Executar o _comando..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8241,11 +8549,11 @@ msgstr "Acerca de"
 msgid "Con_tinue"
 msgstr "_Continuar"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -8254,32 +8562,32 @@ msgstr "_Cancelar"
 msgid "_Open Containing Folder"
 msgstr "_Abrir un cartafol de contido"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Transferencias"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "listaxe de transferencias"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Limpar"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Elimina da listaxe as transferencias rematadas, canceladas e erradas"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias da listaxe"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8287,35 +8595,40 @@ msgstr ""
 "Esta acción elimina transferencias da listaxe. Se a transferencia estiver "
 "activa, detense primeiro e elimínase despois"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Cancela a transferencia seleccionada do ficheiro e elimina o ficheiro "
 "incompleto"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Cancelar a transferencia"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Cancela a transferencia seleccionada do ficheiro"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Enviar e pechar"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Oculta a fiestra"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificarme cando rematar unha transferencia"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Cando unha transferencia se completar, amosa unha notificación emerxente"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 #, fuzzy
 msgid "Shows a list of file transfers between you and others"
 msgstr "Amosa unha listaxe de transferencias entre vostede e outra persoa"
@@ -8325,7 +8638,7 @@ msgid "Register to"
 msgstr "Rexistrar en"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Aceptar"
 
@@ -8359,22 +8672,22 @@ msgstr "_Letra:"
 msgid "Clear formatting"
 msgstr "Información"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Elixa un ficheiro para enviar..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Acontecemento"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Eventos"
@@ -8437,7 +8750,7 @@ msgstr "<b>Sons</b>"
 msgid "<b>#</b>"
 msgstr "<b>Sons</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "núm."
 
@@ -9215,10 +9528,6 @@ msgstr "_Abrir..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor de configuración avanzada</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avanzado"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Iniciar a charla"
@@ -9476,7 +9785,7 @@ msgid "_Open Email Composer"
 msgstr "_Abrir o editor de correo"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Iniciar a charla"
 
@@ -9522,6 +9831,10 @@ msgstr "Preferencias"
 msgid "Default:"
 msgstr "Por defecto"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Engadir un contacto novo"
@@ -9547,6 +9860,16 @@ msgstr "_Alcume:"
 msgid "_Group:"
 msgstr "_Grupo:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID de usuario:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Alcume"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9585,6 +9908,11 @@ msgstr ""
 "Debe estar conectado ao transporte para poder\n"
 "engadir un contacto deste protocolo."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Cambiar a mensaxe de estado"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -9815,10 +10143,10 @@ msgstr "Executar o _comando..."
 msgid "_Verify"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Contas"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Descrición</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9845,11 +10173,6 @@ msgstr "Amosar os contactos desconectados"
 msgid "Show Transports"
 msgstr "Amosar os trans_portes"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Transferencias"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9923,34 +10246,24 @@ msgstr ""
 msgid "Pr_int status:"
 msgstr "Amosar o estado:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Descrición"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Informar do erro"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Probabelmente non é crítico mais, porén, debe informarse aos desenvolvedores."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Solicitude de subscrición"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Informar do erro"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
@@ -9959,16 +10272,11 @@ msgstr ""
 "Denegar a autorización do contacto para que non poida saber cando estou "
 "conectado"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Accións"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_torizar"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 #, fuzzy
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autorizar o contacto para que poida saber cando estou conectado"
@@ -9987,27 +10295,32 @@ msgstr ""
 msgid "Presets"
 msgstr "_Presenza"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "JID do contacto co que quere conversar"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
 msgid "MUC server"
 msgstr "Observadores"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Con_vidar"
@@ -10130,11 +10443,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Serán"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10300,6 +10608,16 @@ msgstr "Amosar todos os _eventos pendentes"
 msgid "Mute Sounds"
 msgstr "Sen sons"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferencias"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Saír"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "A:"
@@ -10704,14 +11022,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configuración da sala"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Cliente de MI de Jabber"
@@ -10836,6 +11146,23 @@ msgid "Plugin manager"
 msgstr "Fallou a conexión"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "da conta %s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Descrición"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "Gustaríame engadilo á miña listaxe de contactos."
+
+#~ msgid "_Actions"
+#~ msgstr "_Accións"
+
+#, fuzzy
 #~ msgid "Start Chat..."
 #~ msgstr "_Iniciar a charla"
 
@@ -11014,14 +11341,6 @@ msgstr "Fallou a conexión"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Uso: /%s, oculta os botóns de charla."
 
-#, fuzzy
-#~ msgid "File is empty"
-#~ msgstr "Camiño do ficheiro"
-
-#, fuzzy
-#~ msgid "File does not exist"
-#~ msgstr "Non existe o grupo de charla."
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -11031,59 +11350,6 @@ msgstr "Fallou a conexión"
 #~ "antiga."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "Pausada"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "Pausada"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Descoñecido"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Ten erros"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Ningunha"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Ningunha"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Ningún"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "Ningún"
-
-#~ msgid "?print_status:All"
-#~ msgstr "Todos"
-
-#, fuzzy
-#~ msgid "?print_status:None"
-#~ msgstr "Todos"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "En líña"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "conta"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "estado"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "mensaxe"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Pr_ioridade:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "De"
 
@@ -11095,31 +11361,6 @@ msgstr "Fallou a conexión"
 #~ msgid "?CLI:password"
 #~ msgstr "Contrasinal: "
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Grupos de charla"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Descarga"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Subida"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "Pausada"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Descoñecido"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Descoñecido"
-
-#, fuzzy
-#~ msgid "?Time:Unknown"
-#~ msgstr "Descoñecido"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Usar DBus e o notificador Daemon para amosar as notificacións"
 
@@ -11444,18 +11685,6 @@ msgstr "Fallou a conexión"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Entrada de XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtro:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Entrada de XML</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Enviar"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Consola XML para %s"
 
@@ -11678,10 +11907,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "está a prestar atención á conversa"
 
 #, fuzzy
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Descrición</b>"
-
-#, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Nome de contacto"
 
@@ -12446,10 +12671,6 @@ msgstr "Fallou a conexión"
 #~ msgstr "Esta conta xa está configurada no Gajim."
 
 #, fuzzy
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP: "
-
-#, fuzzy
 #~ msgid "Idle"
 #~ msgstr "Id"
 
@@ -12479,12 +12700,6 @@ msgstr "Fallou a conexión"
 #~ "Uso: /%s <acción>, envíalle unha acción ao grupo de charla actual. Usa a "
 #~ "terceira persoa. (por exemplo /%s berra.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Cifrado activado"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Cifrado desactivado"
-
 #~ msgid "_Servidor:"
 #~ msgstr "_Host:"
 
diff --git a/po/he.po b/po/he.po
index 77edbf058..8d98111ba 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2014-06-21 16:23+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan@gmx.ca>\n"
 "Language-Team: Rahut\n"
@@ -29,20 +29,20 @@ msgstr "פינג?"
 msgid "Error."
 msgstr "שגיאה."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "האם באמת לשלוח קובץ?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "אם תשלח קובץ אל %s, הוא/היא ידעו את המזהה Jabber שלך במלואו."
@@ -99,73 +99,73 @@ msgstr "זמן"
 msgid "Progress"
 msgstr "התקדמות"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "שם קובץ: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "גודל: %s"
 
 # Can this be changed to: Me?
 # את/ה
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "עצמך"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "ממען: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "נמען: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "נשמר בתוך: ‎%s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "העברת קובץ הושלמה"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_פתח תיקיה מכילה"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "העברת קובץ בוטלה"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "חיבור עם עמית לא היה אפשרי לביסוס."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "נמען: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "הודעת שגיאה: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "העברת קובץ נעצרה"
 
 # אופן מסולף
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, fuzzy, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -175,131 +175,131 @@ msgstr ""
 "הקובץ %(file)s התקבל בהצלחה, אך נראה כי הוא התקבל באופן לא תקין.\n"
 "האם ברצונך להטעינו מחדש?"
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "בחירת קובץ לשליחה..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_שלח"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "תיאור: "
 
 # להשיג גישה
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "‏Gajim לא מסוגל לגשת לקובץ זה"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
 # להחליף
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "אין אפשרות לכתוב על קובץ קיים \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "קובץ בשם זה כבר ישנו ואין לך הרשאה לכתוב עליו."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "קובץ זה כבר ישנו"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "מה ברצונך לעשות?"
 
 # זמין לכתיבה
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "המדור \"%s\" אינו נתון לכתיבה"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "אין לך הרשאות ליצור קבצים במדור זה."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "שמור קובץ בשם..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "קובץ: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "טיפוס: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "תיאור: %s"
 
 # direction_mark
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "‏%s רוצה לשלוח אליך קובץ:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "כעת בודק קובץ..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 msgid "File error"
 msgstr "שגיאת קובץ"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ש)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "קובץ שגוי"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "קובץ: "
 
 # לא קיימת אפשרות
 # אין אפשרות
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "אין זה אפשרי לשלוח קבצים ריקים"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "שם: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "ממען: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "השהה"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "ה_משך"
 
@@ -471,41 +471,61 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "יש צורך בהתקנת python-gupnp-igd."
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "זמינות"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "תכונה"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "שגיאה בקריאת קובץ:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "שגיאה בניתוח קובץ:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "הרחבה לא נתמכת"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "אין אפשרות לשמור תמונה בפורמט %(type)s. לשמור בתור %(new_filename)s?"
 
 # בתור
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "שמירת תמונה בשם..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "נשמר בתוך: ‎%s"
 
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "לא ידוע"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "לא ידועה"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "לא ידוע"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "<b>תפקיד:</b>"
+
 # שיוך, סיפוח
-#: gajim/vcard.py:385
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>השתייכות:</b>"
 
@@ -513,7 +533,7 @@ msgstr "<b>השתייכות:</b>"
 # BUG:?
 # interested at his/her presence
 # interested in his/her presence information
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -521,7 +541,7 @@ msgid ""
 msgstr ""
 "איש קשר זה מעוניין במידע נוכחותך, אולם אין לך עניין בנוכחותו של איש קשר זה"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -531,40 +551,50 @@ msgstr ""
 "בנוכחותך"
 
 # אחד את השני
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "הינך וגם איש הקשר מעוניינים במידע הנוכחות של זה את זה"
 
 # אחד את השני
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "הינך וגם איש הקשר מעוניינים במידע הנוכחות של זה את זה"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "הינך מחכה למענה איש קשר בנוגע לבקשת רישומך"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "לא קיימת שום בקשת הרשמה ממתינה."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " משאב עם עדיפות "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "כל הקבצים"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "מנקה"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "ניהול דיוקני Proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -607,13 +637,13 @@ msgid "_New Group Chat"
 msgstr "שיחת קבוצה _חדשה"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "לא ברשימה"
 
@@ -626,7 +656,7 @@ msgstr "ברצוני להוסיף אותך לרשימה שלי"
 msgid "Send Single _Message…"
 msgstr "שלח הודעה _בודדת..."
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "שלח מצב מו_תאם"
@@ -644,25 +674,25 @@ msgstr "_נהל מוביל"
 msgid "_Modify Transport"
 msgstr "ה_תאם מוביל"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_שנה שם"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_בטל חסימה"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_חסום"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "הס_ר"
@@ -676,215 +706,235 @@ msgstr "_מידע"
 msgid "Send File..."
 msgstr "שלח _קובץ..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "הזמן _אנשי קשר"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "הו_סף לרשימה"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "בדיקת קול"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "בדיקת וידאו"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_מידע"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_היסטוריה"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "נהל _חדר"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "שנה _נושא..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "ה_גדר חדר..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "ה_חרב חדר"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "שנה שם _כינוי..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "_סמן את חדר זה"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_בקש ביטוי"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "הודעות מותאמות:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_מזער בעת סגירה"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "הרץ _פקודה"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "הת_נתק"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "הצטרף לשיחת קבוצה"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "הוסף _איש קשר..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "cli"
 
 # איתור
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "מצא _שירותים"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "שלח הודעה _בודדת..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "מתקדם"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "ערוך העדפות _ארכיונאות"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "סנכרון"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "רשימות פרטיות"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "שרת"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "מסוף XML"
 
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_מנהל"
+
 # בשורה מסר
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_שלח הודעת שרת..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "הגדר MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "עדכן MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "מחק MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "אין חשבון זמין"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "חשבונות"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "cli"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "cli"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 #, fuzzy
 msgid "Show this help message and exit"
 msgstr "cli"
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "אין אפשרות למצוא מסד נתונים של רשומות היסטוריה"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "‏JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "תאריך"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "שם כינוי"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "הודעה"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "נושא"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "האם ברצונך לנקות את מסד הנתונים? (פעולה זו בהחלט לא מומלצת כאשר Gajim מורץ)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -899,98 +949,98 @@ msgstr ""
 "\n"
 "במידה ותבחר להקיש כן, אנא המתן..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr "ניקוי מסד נתונים"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "יצוא רשומות היסטוריה..."
 
 # BUG: said > wrote?
 # Needs to be tested
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "‏%(who)s בשעה %(time)s אמר/ה: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את הרשומות של %(jid)s?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את הרשומות של אנשי קשר נבחרים?"
 
 # BUG: general title without "the"
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "השירות לא היה יכול להימצא"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr "אימות מחיקה"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "האם אתה בטוח כי ברצונך למחוק את ההודעה הנבחרת?"
 msgstr[1] "האם אתה בטוח כי ברצונך למחוק את ההודעות הנבחרות?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "פעולה זו הינה בלתי הפיכה."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "כעת מאחזר דיוקן..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "לא היתה אפשרות להטעין תמונה"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "תסדיר תאריך שגוי"
 
 # חייב
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "הפורמט של התאריך מוכרח להיות YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "מידע התקבל"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "אינך מחובר לשרת"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 msgid "Without a connection, you can not publish your contact information."
 msgstr "ללא חיבור, אין באפשרותך לפרסם את מידע איש הקשר שלך."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "כעת שולח דיוקן..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "מידע לא פורסם"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "פרסום vCard נכשל"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1007,10 +1057,10 @@ msgid "JID: <i>%s</i>"
 msgstr "מזהה Jabber: ‏<i>%s</i>"
 
 # (קבוצה כללית)
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "כללית"
@@ -1096,39 +1146,39 @@ msgstr "אנא מלא את המידע של איש הקשר אשר ברצונך �
 msgid "Please fill in the data of the contact you want to add"
 msgstr "אנא מלא את המידע של איש הקשר אשר ברצונך להוסיף"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "מזהה משתמש שגוי"
 
 # אסור להכיל
 # אסור ש
 # מוכרחה שלא
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "מזהה משתמש לא יכול להכיל משאב."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "אין באפשרותך להוסיף את עצמך לרשימה שלך."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "איש קשר כבר מצוי ברשימה"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "איש קשר זה כבר מצוי ברשימה שלך."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "מזהה משתמש:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "שגיאה בעת הוספת שירות. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1136,50 +1186,50 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "לקוח Jabber/XMPP מבוסס GTK+‎"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "גרסא:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "גרסא:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "‎מפתחים נוכחיים:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "‎מפתחים מן העבר:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "‎.ואחרון אחרון חביב, ברצוננו להודות לכל מתחזקי החבילות"
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Lead Translator:\n"
@@ -1192,12 +1242,12 @@ msgstr ""
 "Rahut Contributors:\n"
 "  Isratine Citizen (genghiskhan AT gmx.ca)"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "מילון עבור שפה %s לא זמין"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1210,8 +1260,8 @@ msgstr ""
 "\n"
 "הדגשת מילים אשר לא אויתו כראוי לא תנוצל"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "חיבור לא מאובטח"
 
@@ -1221,7 +1271,7 @@ msgstr "חיבור לא מאובטח"
 # discouraged:
 #  > deprived > לקוי בחסר
 #  > dissuade > dissuade from > להניא מ-
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1234,284 +1284,308 @@ msgstr ""
 "להימנע מחיבורים מטיפוס זה.\n"
 "האם אתה בטוח כי ברצונך להתחבר?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "כן, אני באמת רוצה להתחבר בשיטה לא בטוחה"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "‏Gajim לא יתחבר אלא אם כן תיבה זו תסומן"
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "אל ת_שאל אותי שוב"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "_חזור"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "ה_חלף"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "שם כינוי שגוי"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 msgid "The nickname contains invalid characters."
 msgstr "שם הכינוי מכיל תווים אסורים."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "בקשת הרשמה"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "בקשת הרשמה עבור חשבון %(account)s מאת %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "בקשת הרשמה מאת %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "הצטרף לשיחת קבוצה"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "חדר שגוי"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "שם כינוי שגוי"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "אנא צור מוטיב חדש עם השם הרצוי עליך."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "כתובת JID שגויה"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "אין באפשרותך להצטרף לשיחת קבוצה אלא כאשר תחובר."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 msgid "Wrong server"
 msgstr "שרת שגוי"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, python-format
 msgid "%s is not a groupchat server"
 msgstr "‏%s אינו שרת שיחת קבוצה"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "ללא חיבור, אין באפשרותך לסנכרן את אנשי הקשר שלך."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "שם"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "שרת"
 
 # Sync account > Unlogged account > Error
 # Should this be "to its server" OR "to a server"?
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "חשבון זה אינו מחובר כעת לשרת"
 
 # BUG: synchronise with *another* account
 # עד אשר זה לא יחובר
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "אין באפשרותך להסתנכרן עם חשבון אלא אם כן החשבון הינו מחובר."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "סנכרון"
 
 # שבר משולב continued fraction
 # שיחה נמשכת
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "שיחה משולבת"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "שיחת קבוצה חדשה"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "הוספת איש קשר חדש"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "ללא חיבור, אין באפשרותך לשנות סיסמה."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "סיסמה שגויה"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "עליך להזין סיסמה."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "סיסמאות לא תואמות"
 
 # על הסיסמאות
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "הסיסמאות אשר מוקלדות בשני השדות מוכרחות להיות זהות."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "איש קשר התחבר"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "איש קשר התנתק"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "הודעה חדשה"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "הודעה בודדת חדשה"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "הודעה פרטית חדשה"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "דוא״ל חדש"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "בקשת העברת קובץ"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "שגיאת העברת קובץ"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "העברת קובץ הושלמה"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "העברת קובץ נעצרה"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "הזמנת שיחת קבוצה"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "איש קשר שינה מצב"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "הודעה בודדת באמצעות חשבון ‫%s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "הודעה בודדת בתוך חשבון ‫%s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "הודעה בודדת"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "שליחת %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "התקבלה %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "טופס %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "חיבור לא זמין"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "אנא ודא כי אתה מחובר בעזרת \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "אין אפשרות לשלוח הודעה אל %s, כתובת JID זו אינה תקפה."
 
 # Is there RE for Hebrew?
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr ""
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "‏%s כתב/ה:\n"
 
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "מנקה"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "סינון:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>קלט XML</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_שלח"
+
 # רוצה לה
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "להוסיף"
 
 # Is this Change or Adjust?
 # לשנות
 # תתאים
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "להתאים"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "להסיר"
 
@@ -1520,7 +1594,7 @@ msgstr "להסיר"
 # רוצה ש<b>תוסיף</b> מספר אנשי קשר ברשימה
 # כי <b>תוסיף</b>
 # ממך <b>להוסיף</b>
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1528,36 +1602,36 @@ msgid ""
 msgstr ""
 "‏<b>%(jid)s</b> מעוניין <b>%(action)s</b> מספר אנשי קשר בתוך הרשימה שלך."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "הוסף"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "התאמה"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "מחק"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "קבוצות"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "‏%s הציע לי להוסיף אותך לרשימה שלי."
 
 # נוספו
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "הוסף איש קשר %d"
 msgstr[1] "הוספו %d אנשי קשר"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1565,180 +1639,180 @@ msgstr[0] "הוסר איש קשר %d"
 msgstr[1] "הוסרו %d אנשי קשר"
 
 # ארכיונאות
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "העדפות גנזך עבור ‫%s"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
 # ארכיונאות
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "העדפות גנזך עבור ‫%s"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "ישנה שגיאה"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "שגיאה"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "מזהה Jabber"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "רשימת פרטיות ‫<b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "רשימת פרטיות עבור ‫%s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "רשימת פרטיות"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "סדר: %(order)s, פעולה: %(action)s, טיפוס: %(type)s, ערך: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "סדר: %(order)s, פעולה: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>עריכת כלל</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>הוספת כלל</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "רשימות פרטיות עבור ‫%s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "שם רשימה שגוי"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "עליך להזין שם כדי ליצור רשימת פרטיות."
 
 # Changed to: You have been invited to a groupchat
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "הוזמנת לשיחת קבוצה"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact הזמינך להצטרף לדיון"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact הזמינך לשיחת קבוצה %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "הערה: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "האם ברצונך לקבל את ההזמנה?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr "סיבה (באם רצונך בדחיית ההזמנה):"
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "בחירת תעודת לקוח ‎#PCKS12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "קבצי PKCS12"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "בחירת צליל"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "צלילי Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "בחירת תמונה"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "תמונות"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "בחירת ארכיון"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "קבצי Zip"
 
 # הופך ל
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "כאשר %s נהיה:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "הוספת התראה מיוחדת עבור ‫%s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "קול וגם וידאו"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "קול"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "וידאו"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr "‏%(contact)s רוצה להתחיל עמך בסשן %(type)s. האם יש ברצונך לענות לקריאה?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr "תעודה עבור חשבון ‫%s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, fuzzy, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1779,72 +1853,100 @@ msgstr ""
 "<b>טביעת אצבע</b>\n"
 "טביעת אצבע SHA1: ‏%(sha1)s"
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "אימות תעודת SSL עבור %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 #, fuzzy
 msgid "View cert…"
 msgstr "הצג תעודה..."
 
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "העברות קבצים"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "הצפנת E2E מנוטרלת כעת"
+
 # בכינוי
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s ידוע/ה כעת בתור %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s מצוי/ה כעת במצב %(status)s "
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "מסירת הודעה פרטית נכשלה"
 
 # אינך עוד בשיחת קבוצה או שהמשתמש עזב
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "אינך נוכח בשיחת קבוצה \"%(room)s\" או שהמשתמש \"%(nick)s\" עזב."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "אחסון אנשי קשר מוצמדים לא נתמך על ידי השרת שלך"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "שינוי נושא"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "אנא ציין את נושא חדש:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "שינוי שם כינוי"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "אנא ציין שם כינוי חדש אשר ברצונך לעשות בו שימוש:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "מזהה Jabber של שיחת קבוצה שגוי"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "מזהה Jabber של שיחת קבוצה מכילה תווים אסורים."
 
 # Destroying is "at this moment".  It should be Destroy without ing
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "החרבת ‫%s"
 
 # בחרת להחריב באופן מוחלט את חדר זה
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1854,24 +1956,24 @@ msgstr ""
 "באפשרותך לציין סיבה למטה:"
 
 # מקום מפגש חלופי
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "באפשרותך להזין זירה אלטרנטיבית:"
 
 # להכניס/להזין
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "שבץ שם כינוי"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "והינה מאומתת"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "ואינה מאומתת"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
@@ -1879,262 +1981,272 @@ msgstr ""
 "סשן שיחתך %(logged)s ברשומות ההיסטוריה."
 
 # direction_mark needed
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "שיחה עם "
 
 # שבר משולב continued fraction
 # שיחה נמשכת
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "שיחה משולבת"
 
 # ‏%(jid)s הגדיר/ה את הנושא אל %(subject)s
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "הנושא הוגדר על ידי %(nick)s אל %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "כל נוכח רשאי לראות את המזהה Jabber שלך במלואו"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr "כרגע החדר מציג חברים אשר אינם זמינים"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr "כרגע החדר לא מציג חברים אשר אינם זמינים"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "רישום פעילות חדר מאופשר כעת"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "רישום פעילות חדר מנוטרל כעת"
 
 # This room is not anonymous
 # חדר לא אנונימי
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "החדר אינו אנונימי"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "החדר הינו אנונימי למחצה"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "החדר הינו אנונימי לחלוטין"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "פונג! (%s ש.)"
 
 # in or to?
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(jid)s הוזמן/ה לחדר זה"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "רישום של פעילות חדר הינו מאופשר"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "חדר חדש נוצר"
 
 # BUG: room nick
 # הקצה
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "השרת הסב או שינה את כינוי החדר שלך"
 
 # סולק
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s נבעט/ה: %(reason)s"
 
 # סולק
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s נבעט/ה על ידי %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s נאסר/ה: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s נאסר/ה על ידי %(who)s: %(reason)s"
 
 # את/ה ידוע/ה כעת בתור
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "הכינוי החדש שלך הוא %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s הוסר/ה מתוך החדר (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "שיוך שונה"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "תצורת חדר שונתה אל חברים-בלבד"
 
 # הדממת, דימום
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "סגירת מערכת"
 
 # נקבע
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** השיוך של %(nick)s הוגדר אל %(affiliation)s על ידי %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** השיוך של %(nick)s הוגדר אל %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** התפקיד של %(nick)s הוגדר אל %(role)s על ידי %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** התפקיד של %(nick)s הוגדר אל %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s עזב/ה"
 
 # הצטרף
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s נכנס/ה לשיחת קבוצה"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "האם אתה בטוח כי ברצונך לעזוב את שיחת קבוצה \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "כאשר תסגור את חלון זה, אתה תנותק מתוך שיחת קבוצה זו."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "בעיטת ‫%s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "באפשרותך לציין סיבה למטה:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "אסירת ‫%s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "העברות קבצים"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "העברת קובץ נכשלה"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "הצגת רשימת עיצובים"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 #, fuzzy
 msgid "Formatting is not available so long as GPG is active"
 msgstr "עיצובים אינם נתמכים כאשר GPG הינו פעיל"
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
 msgstr "איש קשר זה לא תומך HTML"
 
 # This status message is not aligned by Gajim
 # Should a bug be reported?
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "מצב : %(type)s :‏ %(state)s, סיבה: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s מתוך שיחת קבוצה %(room_name)s"
 
 # משא ומתן
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "הסדרת סשן בוטלה"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "סשן זה יושם בארכיון על שרת"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "סשן זה לא יושם בארכיון על שרת"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "סשן זה הינו מוצפן"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " ויירשם"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " ולא יירשם"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "זהות איש קשר מרוחק לא מאומתת. לחץ על לחצן המגן לשם פרטים נוספים."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "הצפנת E2E מנוטרלת כעת"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "זה עתה קיבלת הודעה חדשה מן \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "אם כרטיסייה זו תיסגר וכאשר רשימת היסטוריה מנוטרלת אצלך. הודעה זו תאבד."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2144,7 +2256,7 @@ msgstr ""
 "%(message)s"
 
 # כי משהו שיבש אותה
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2153,92 +2265,92 @@ msgstr ""
 "אין אפשרות לפענח הודעה מאת %s\n"
 "ייתכן כי הודעה זו נפגמה."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s מצוי/ה כעת במצב %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 msgid "File transfer"
 msgstr "העברת קובץ"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr "גודל"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr "_קבל"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "ה_צטרף"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "איש קשר מרוחק הפסיק העברה"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "שגיאה בפתיחת קובץ"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "חשבונות ממוזגים"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "שיחות קבוצה"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "מובילים"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "הרשאה נשלחה"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "מעתה המצב שלך יהיה גלוי בפני \"%s\"."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "בקשת הרשמה נשלחה"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "אם בקשתך תתקבל על ידי \"%s\" המצב שלו או שלה יהיה גלוי בפניך."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "הרשאה הוסרה"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "מעתה המצב שלך יראה בתור לא מקוון עבור \"%s\"."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr "הצפנת OpenPGP אינה שמישה"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2246,11 +2358,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "אתה משתתף בשיחת קבוצה אחת או יותר"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2258,40 +2370,40 @@ msgstr ""
 "שינוי המצב שלך אל בלתי נראה יגרום לניתוק מתוך שיחות קבוצה אלו. האם אתה בטוח "
 "כי ברצונך להפוך את המצב שלך אל בלתי נראה?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "לא מסונכרן"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "באמת לצאת מתוך Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "האם אתה בטוח כי ברצונך לסגור את Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "סגור את Gajim תמיד"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "נותרו העברות קבצים פעילות"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "אם תצא עכשיו, הקבצים אשר מועברים כעת יופסקו. האם עדיין ברצונך לצאת?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "נותרו הודעות אשר לא נקראו"
 
 # BUG: and (A or THE) contact
 # קיימת לרשותך
 # היסטוריה מאופשרת
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2299,27 +2411,27 @@ msgstr ""
 "הודעות יהיו זמינות לקריאה מאוחרת רק אם אפשרת רישום היסטוריה ואיש הקשר מצוי "
 "ברשימה שלך."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "עליך לקרוא אותן בטרם הסרת מוביל זה."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "מוביל \"%s\" יוסר"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "לא תעמוד עוד לרשותך האפשרות לקבל וגם לשלוח הודעות מאנשי קשר באמצעות מוביל זה."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "מובילים יוסרו"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2328,13 +2440,13 @@ msgstr ""
 "לא תעמוד עוד לרשותך האפשרות לקבל וגם לשלוח הודעות לאנשי קשר מתוך מובילים "
 "אלו: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "בחרת לחסום איש קשר. האם אתה בטוח כי ברצונך להמשיך?"
 
 # BUG: HE and SHE
 # על ידו או על ידה
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2343,57 +2455,57 @@ msgstr ""
 "איש קשר זה תמיד יראה אותך במצב לא מקוון ולא תהיה באפשרותך לקבל הודעות אשר "
 "יישלחו אליך ממנו."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "שינוי שם איש קשר"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "הזן שם כינוי חדש עבור איש קשר %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "שינוי שם קבוצה"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "הזן שם חדש עבור קבוצת %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "הסרת קבוצה"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "האם ברצונך להסיר את קבוצת %s מתוך הרשימה?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "הסר גם את כל אנשי הקשר שבקבוצה זו מתוך הרשימה שלי"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "הקצאת מפתח OpenPGP"
 
 # BUG: Select a key to apply to contact "JID"
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "בחר מפתח ליישום עבור איש הקשר"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "איש קשר \"%s\" יוסר מתוך הרשימה שלך"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "בחרת להסיר את \"%(name)s\" (%(jid)s) מתוך הרשימה שלך.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2403,11 +2515,11 @@ msgstr ""
 "אתה גם תסיר הרשאה דבר אשר יגרום למצב בו אנשי קשר אלה תמיד יראו אותך במצב לא "
 "מקוון."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "האם ברצונך להמשיך?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2417,15 +2529,15 @@ msgstr ""
 "קשר זה תמיד יראה אותך במצב לא מקוון."
 
 # לאחר כעבור
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "ברצוני כי איש קשר זה יהיה מיודע באשר למצב שלי עובר הסרה"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "אנשי קשר יוסרו מתוך הרשימה שלך"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2435,12 +2547,12 @@ msgstr ""
 "אתה גם תסיר הרשאה דבר אשר יגרום למצב בו אנשי קשר אלה תמיד יראו אותך במצב לא "
 "מקוון."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "בחרת לשלוח מצב מותאם. האם אתה בטוח כי ברצונך להמשיך?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2449,25 +2561,25 @@ msgstr ""
 "איש קשר זה יראה אותך באופן זמני במצב %(status)s, אך רק עד אשר תשנה את המצב "
 "שלך. אחרי כן זה יראה את המצב הגלובלי שלך."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "אין חשבון זמין"
 
 # לפני שתעמוד לרשותך האפשרות לשוחח
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "עליך ליצור חשבון בטרם תהיה באפשרותך לשוחח עם אנשי קשר אחרים."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "אין באפשרותך להשתתף בשיחת קבוצה כאשר הינך במצב בלתי נראה"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "אחסון אנשי קשר מוצמדים לא נתמך על ידי השרת שלך"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -2475,12 +2587,12 @@ msgstr ""
 "השרת שלך לא תומך באחסון מידע אנשי קשר מוצמדים. לכן מידע זה לא יישמר בהתחברות "
 "הבאה."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "בחרת ליצור איש קשר מוצמד. האם אתה בטוח כי ברצונך להמשיך?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2490,197 +2602,197 @@ msgstr ""
 "כללי זו בשימוש כאשר אותה האישיות מחזיקה במספר חשבונות Jabber או חשבונות "
 "מוביל."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "כתובת URI של קובץ שגויה:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "האם ברצונך לשלוח קובץ זה אל %s:"
 msgstr[1] "האם ברצונך לשלוח קבצים אלו אל %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "שלח את %s אל %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "הפוך את %s לאיש קשר ראשון"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "הפוך את %s ואת %s לאנשי קשר מוצמדים"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_שנה הודעת מצב"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "פרסם לחן"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "פרסם מיקום"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "הגדר שירותים..."
 
 # restore
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "ה_גדל את כולם"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "שלח הודעת _אשכול"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "אל כל המשתמשים"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "אל כל המשתמשים המקוונים"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "ה_זמן אל"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_נהל אנשי קשר"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "ערוך _קבוצות"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "הס_ר"
 
 # Restore שחזר
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "ה_גדל"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "הת_חבר מחדש"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "הת_נתק"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_היסטוריה"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "מנהל היסטוריה"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "ה_צטרף לשיחת קבוצה חדשה"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_שנה הודעת מצב"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "הצג סמל אזור התראה:"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "cli"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "cli"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "cli"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "cli"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Configure logging system"
 msgstr "cli"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "הצג _אירועים ממתינים"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "שגיאת מסד נתונים"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "מה ברצונך לעשות?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "מתחבר כעת"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "קדם הודעות אשר לא נקראו"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2689,7 +2801,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2697,7 +2809,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2848,16 +2960,16 @@ msgstr "חשבון מנוטרל"
 msgid "To unregister from a server, account must be enabled."
 msgstr "כדי לבטל רישום מתוך שרת, על חשבון נתון להיות מאופשר."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "נדרשת מילת מעבר"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "הזן סיסמה עבור חשבון %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "שמור סיסמה"
 
@@ -2891,10 +3003,18 @@ msgstr "להסיר מתוך Gajim בלבד"
 msgid "Don't remove anything. I'll try again later"
 msgstr "לא להסיר דבר. אני אנסה שוב מאוחר יותר"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "הכל"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "כניסה ועזיבה בלבד"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "אל תדפיס"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "שיחת קבוצה חדשה"
@@ -2960,12 +3080,12 @@ msgid "Custom port must be a port number."
 msgstr "פורט מותאם מוכרח להיות מספר פורט."
 
 # BUG: גודל אותיות באנגלית?
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "התעודה כבר מצויה בקובץ"
 
 # חריג לכלל: עשיתי שימוש במילה שנית במקום שוב מכיוון שתמיד יהיה 'ראשון' ולאחריו שני
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "תעודה זו כבר מצויה בקובץ %s, ולכן היא לא תוסף בשנית."
@@ -3068,91 +3188,113 @@ msgstr "הודעת שיחת קבוצה מודגשת"
 msgid "Group Chat Message Received"
 msgstr "הודעת שיחת קבוצה אשר התקבלה"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "‏%(owner_or_admin_or_member)s בשיחת קבוצה זו"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "ללא"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "חבר"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "מנהל"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "בעלים"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [חסומה]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [ממוזערת]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "מחובר"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "מנותק"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "הורדה"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "העלאה"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "טיפוס: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "הועברו: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "לא הותחלה"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "נעצרה"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "הושלמה"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "הושהתה"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "מוקפאת"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "כעת מעביר"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "מצב: "
 
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "זמין"
+
 # BUG: x2
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "חופשי לשיחה"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "נעדר"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "עסוק"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "לא זמין"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "לא מקוון"
 
@@ -3202,125 +3344,129 @@ msgstr "(אין)"
 msgid "Hidden"
 msgstr "מוסתר"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr "מחשב על סף שינה‫"
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "היסטוריית שיחה עם ‫%s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "היסטוריית שיחה"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "שגיאת כונן"
 
 # Fix Psi status with brackets in Psi with LTR at its end - see realisation below
 # ‏Auto Status (idle)
 # ‏Auto Status (idle)‎
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s מצוי/ה כעת במצב %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "שגיאה: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "שגיאה"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "מצב נוכחי: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "מצב נוכחי: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "נושא: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_שנה הודעת מצב"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "באמצעות חשבון %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "ניהול סימניות"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "הסתר _רשימה"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "הצג _רשימה"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "הסתר תפריט זה"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "אין אפשרות לטעון תמונה"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "טיפוס מדיה לא נתמך: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "שדה זה הינו נדרש"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "שם מ_ארח:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "תגובת שרת: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3484,7 +3630,7 @@ msgstr "הי_רשם"
 msgid "_Unsubscribe"
 msgstr "_בטל הרשמה"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3492,51 +3638,60 @@ msgstr ""
 "תמליל תחת שורה זו הוא דברים אשר נרשמו מאז הפעם\n"
 "האחרונה בה הסבת את תשומת לבך לשיחת קבוצה זו"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_צטט"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_פעולות עבור \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "עיין ערך _ויקיפדיה"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "חפש בתוך _מילון"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "לכתובת URL של המילון חסר \"%s\" וזו לא WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "לכתובת URL של חיפוש ברשת חסר \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_חפש ברשת"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "פתח בתור _קישור"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr "‏URL:"
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "כתובת JID שגויה"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+#, fuzzy
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+"<b>הודעה תוקנה. הודעה אחרונה היתה:</b>\n"
+"  %s"
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3548,30 +3703,35 @@ msgstr[1] "לפני %(nb_days)i ימים"
 msgid "Write a message.."
 msgstr "cli"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "בחרת לסגור מספר כרטיסיות"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "האם אתה בטוח כי ברצונך לסגור את כולן?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "שיחות קבוצה"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "שיחות פרטיות"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "הודעות"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3583,109 +3743,109 @@ msgstr ""
 "נוכח אחר.\n"
 "אנא ציין שם כינוי אחר למטה:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "השתמש תמיד בשם כינוי זה כאשר ישנה התנגשות"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "האם לקבל את בקשה זו?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "האם לקבל את בקשה זו בחשבון %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "הרשאת HTTP (%(method)s) עבור %(url)s (מזהה: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "התחברות נכשלה"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "נדרשת מילת מעבר כדי להצטרף לחדר %s. אנא הקלד אותה."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>גופן</b>"
 
 # בכתובת
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "נאסרת מתוך שיחת קבוצה בכתובת <b>%s</b>."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "שיחת קבוצה <b>%s</b> לא קיימת."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "שיחת קבוצה <b>%s</b> לא קיימת."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "יצירת שיחות קבוצה הינה מוגבלת."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "אין אפשרות להצטרף לשיחת קבוצה"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "שם הכינוי הרשום שלך מוכרח להיות בשימוש בתוך שיחת קבוצה <b>%s</b>."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "אינך ברשימת החברים בתוך שיחות קבוצה %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "שגיאה %(code)s: ‏%(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "שגיאה בעת מסירת %(message)s ‏( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "בקשת הרשמה"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "משקיפים"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "התקבלה הרשאה"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "הוענקה לך הרשאה מאת \"%s\" לראות את המצב שלו או שלה."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "איש קשר \"%s\" הסיר הרשמה ממך"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3694,31 +3854,31 @@ msgstr ""
 "איש קשר זה תמיד ייראה עבורך במצב לא מקוון.\n"
 "האם ברצונך להסיר אותו מתוך הרשימת קשר שלך?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "הרשמה בוטלה"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "יצירת קשר עם \"%s\" לא היתה ניתנת לביסוס"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "בדוק את החיבור שלך או נסה שוב מאוחר יותר."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s סרב/ה את ההזמנה: %(reason)s"
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s סרב/ה את ההזמנה"
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
@@ -3726,30 +3886,30 @@ msgstr ""
 "הגדרת את Gajim לעשות שימוש בסוכן OpenPGP, אך אין כעת סוכן OpenPGP אשר מופעל "
 "או שזה החזיר מימרת-סיסמה שגויה.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "התחברותך בוצעה ללא מפתח OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "מימרת סיסמה שגויה"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "מימרת סיסמה שגויה"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 msgid "Certificate Passphrase Required"
 msgstr "נדרשת מימרת סיסמה של תעודת"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "הזן מימרת סיסמה עבור התעודה עבור חשבון %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "בחר מפתח OpenPGP"
@@ -3758,7 +3918,7 @@ msgstr "בחר מפתח OpenPGP"
 # Sure = בטוח
 # Really = באמת
 # Still = עדיין
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
@@ -3768,96 +3928,101 @@ msgstr ""
 
 # BUG: refreshed
 # אסימון
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr "אנא העתק / הדבק את האות הרענן מתוך האתר רשת אשר זה עתה נפתח."
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr "אישורי Oauth2"
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "‏%s רוצה לשלוח לך קובץ."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "שגיאת תעודת SSL"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 msgid "File Transfer Failed"
 msgstr "העברת קובץ נכשלה"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "העברת קובץ %(filename)s מן %(name)s נעצרה."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "העברת קובץ %(filename)s מן %(name)s נכשלה."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "שלחת בהצלחה את %(filename)s אל %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "העברת קובץ %(filename)s אל %(name)s נעצרה."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "העברת הקובץ %(filename)s אל %(name)s נכשלה."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "בחירת קובץ לשליחה..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "אין אפשרות לפענח הודעה"
 
 # התנגשויות, ניגודים, קונפליקט
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "התנגשות שם משתמש"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "אנא הקלד שם משתמש חדש עבור חשבונך המקומי"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "התנגשות משאב"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "אתה כבר מחובר לחשבון זה באמצעות אותו משאב. אנא הקלד אחד חדש"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "‏%s רוצה להתחיל שיחה קולית."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "בקשה לשיחה קולית"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "שגיאה באימות תעודת SSL"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3867,7 +4032,7 @@ msgstr ""
 "אירעה שגיאה תוך כדי אימות תעודת SSL של שרת Jabber זה: %(error)s\n"
 "האם עדיין יש ברצונך להתחבר לשרת זה?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3880,16 +4045,16 @@ msgstr ""
 "טביעת אצבע SHA1 של התעודה:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "התעלם משגיאה זו עבור תעודה זו."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr "שרת לא אנונימי"
 
 # ישנה
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3909,7 +4074,7 @@ msgstr ""
 "\n"
 "האם עדיין יש ברצונך להתחבר ולעדכן את טביעת האצבע של התעודה?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3917,7 +4082,7 @@ msgstr ""
 "אתה על סף שליחת סיסמה על פני חיבור לא מאובטח. עליך להתקין PyOpenSSL בכדי "
 "למנוע זאת. האם אתה בטוח כי ברצונך להתחבר?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3925,33 +4090,33 @@ msgstr ""
 "אתה על סף שליחת סיסמה באופן לא מוצפן על פני חיבור לא מאובטח. האם אתה בטוח כי "
 "ברצונך לעשות זאת?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "זוהי אינה שיחת קבוצה"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "רגשונים נוטרלו"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "מוטיב הרגשונים אשר הגדרת לא נמצא, ומשכך רגשונים נוטרלו."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr "מוטיב הרגשונים אשר הגדרת לא נמצא, ומשכך רגשונים נוטרלו."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "זוהי אינה שיחת קבוצה"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3959,41 +4124,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "לא היתה אפשרות לשמור את ההגדרות וההעדפות שלך"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "ברירת מחדל"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "נדרשת מימרת סיסמה"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "הזן מימרת סיסמה של מפתח OpenPGP עבור מפתח %(keyid)s (חשבון %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 msgid "OpenPGP key expired"
 msgstr "מפתח OpenPGP פקע"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "מפתח OpenPGP פקע, התחברותך אל %s תתקיים בלי OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "מימרת סיסמה שגויה"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "אנא הקלד מחדש מימרת סיסמה OpenPGP או לחץ על ביטול."
 
@@ -4062,6 +4227,11 @@ msgstr "- הודעות יירשמו"
 msgid "- messages will not be logged"
 msgstr "- הודעות לא יירשמו"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "‏OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4091,7 +4261,7 @@ msgstr "טופס שגוי"
 msgid "The form is not filled correctly."
 msgstr "הטופס אינו ממולא כראוי."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "בלתי נראה"
 
@@ -4225,6 +4395,56 @@ msgstr ""
 "%s\n"
 "ייתכן כי קישוריות מסרים מקומית לא תעבוד כראוי."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "לא היתה אפשרות להתחיל שירות מקומי"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "לא היתה אפשרות להטעין תמונה"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "שירות החזיר שגיאה."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "לא היתה אפשרות להטעין תמונה"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "חיבור אינו זמין"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "ערכת נושא"
@@ -4250,7 +4470,17 @@ msgstr "אין ביכולתך למחוק את המוטיב הנוכחי שלך"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "חשבונות ממוזגים"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "השתמש בסוכן G_PG"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "מיד אשוב."
 
@@ -4271,6 +4501,11 @@ msgstr "פתחת שיחה בחשבון %s"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "כל חלונות שיחה וחלונות שיחת קבוצה ייסגרו. האם ברצונך להמשיך?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "הס_ר"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4469,92 +4704,116 @@ msgstr "שינוי סיסמה"
 msgid "Login Options"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 #, fuzzy
 msgid "command"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 #, fuzzy
 msgid "show help on command"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 #, fuzzy
 msgid "Shows or hides the roster window"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "חשבון"
+
+#: gajim/gajim_remote.py:99
 #, fuzzy
 msgid "show only contacts of the given account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 #, fuzzy
 msgid "Prints a list of registered accounts"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+msgid "?CLI:status"
+msgstr ""
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "הודעה"
+
+#: gajim/gajim_remote.py:113
 #, fuzzy
 msgid "status message"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "_עדיפות:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4562,252 +4821,252 @@ msgid ""
 "key', just set 'OpenPGP key' to ''."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 #, fuzzy
 msgid "JID of the contact that will receive the message"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 #, fuzzy
 msgid "message contents"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 #, fuzzy
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 #, fuzzy
 msgid "if specified, the message will be sent using this account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
 "and account. If you want to only set the latter, set OpenPGP key to \"\"."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 #, fuzzy
 msgid "subject"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 #, fuzzy
 msgid "message subject"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 #, fuzzy
 msgid "Sends new message to a groupchat you've joined."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 #, fuzzy
 msgid "Gets detailed info on a contact"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 #, fuzzy
 msgid "JID of the contact"
 msgstr "cli"
 
 # BUG: on an account
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 #, fuzzy
 msgid "Name of the account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 #, fuzzy
 msgid "Sends file to a contact"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 #, fuzzy
 msgid "file"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 #, fuzzy
 msgid "File path"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 #, fuzzy
 msgid "if specified, file will be sent using this account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 #, fuzzy
 msgid "Lists all preferences and their values"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 #, fuzzy
 msgid "Sets value of 'key' to 'value'."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "key=value"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 #, fuzzy
 msgid "Deletes a preference item"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 #, fuzzy
 msgid "key"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 #, fuzzy
 msgid "name of the preference to be deleted"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 #, fuzzy
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 #, fuzzy
 msgid "Removes contact from roster"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 #, fuzzy
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 #, fuzzy
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 #, fuzzy
 msgid "Sends custom XML"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 #, fuzzy
 msgid "XML to send"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 #, fuzzy
 msgid "Missing argument \"contact_jid\""
 msgstr "cli"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, fuzzy, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 #, fuzzy
 msgid "You have no active account"
 msgstr "cli"
 
 # נראה כי Gajim לא מורץ. משכך אין באפשרותך לעשות שימוש ביישום gajim-remote.
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 #, fuzzy
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, fuzzy, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 #, fuzzy
 msgid "Arguments:"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, fuzzy, python-format
 msgid "%s not found"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4816,14 +5075,14 @@ msgid ""
 "Command is one of:\n"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4995,13 +5254,6 @@ msgstr "סוף השבוע"
 msgid "Weekend!"
 msgstr "סופשבוע!"
 
-# Maybe an RTL issue would show up
-# Needs to be tested
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "חשבון XMPP ‫%s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -5025,22 +5277,22 @@ msgstr "החדר הוחרב"
 msgid "You can join this room instead: %s"
 msgstr "באפשרותך להצטרף לחדר זה במקום: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "שגיאת SSL לא מוכרת: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "התקבלה הודעה בודדת חדשה מאת %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "הודעה פרטית חדשה מתוך שיחת קבוצה %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
@@ -5049,32 +5301,32 @@ msgstr ""
 # [09:08:28 PM] Myself: אני חושב שזה: המסר נשלח על-ידי...
 # [09:08:39 PM] Rodensky: לא
 # [09:08:46 PM] Rodensky: זה "התקבלה הודעה מ"
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "התקבלה הודעה מאת %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "הודעה חדשה מאת %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "המצב של %(nick)s שונה"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s התחבר/ה"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s התנתק/ה"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "לא ברשימה"
 
@@ -5932,15 +6184,11 @@ msgstr "אפשור הצפנת ESessions עבור חשבון זה."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "האם על Gajim להתחיל אוטומטית סשן מוצפן במידת האפשר?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"רשימה סדורה (מופרדת על ידי רווח) של טיפוס חיבור לנסות. יכול להכיל tls, ssl "
-"או plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
@@ -5950,7 +6198,7 @@ msgstr ""
 "EXTERNAL,‏ GSSAPI,‏ SCRAM-SHA-1-PLUS,‏ SCRAM-SHA-1,‏ DIGEST-MD5,‏ PLAIN, X-"
 "MESSENGER-OAUTH2 או XEP-0078"
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -5958,20 +6206,20 @@ msgstr ""
 "הצגת דו שיח אזהרה בטרם שליחת סיסמה על פני חיבור גלוי. יכול להיות "
 "'warn' (הזהר), 'connect' (התחבר), 'disconnect' (התנתק)"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "הצג דו שיח אזהרה בטרם שימוש בספריית SSL סטנדרטית."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "הצגת דו שיח אזהרה בטרם שליחת סיסמה חשופה (PLAIN) על פני חיבור גלוי."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "רשימה אשר מופרדת על ידי רווח, של שגיאות ssl שיש להתעלם מהן."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
@@ -5979,7 +6227,7 @@ msgstr ""
 "רשימה אשר מופרדת על ידי רווח, של כתובות JID עבורן אין ברצונך לאחסן רשומות. "
 "באפשרותך גם להוסיף שם חשבון כדי לא לרשום דבר עבור חשבון זה."
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 #, fuzzy
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
@@ -5988,7 +6236,7 @@ msgstr ""
 "הורד רשומות המאוחסנות על שרת בעת הפעלת Gajim אם שרת תומך XEP-0136 או XEP-0313"
 
 # BUG: he or she
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
@@ -5997,28 +6245,28 @@ msgstr ""
 "דיונים כאשר הקצה השני לא מעוניין בכך."
 
 # חלל לבן, עקב
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "סימן לבן נשלח לאחר חוסר פעילות"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "פינג XMPP נשלח לאחר חוסר פעילות"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 "כמה שניות להמתין עבור תשובת חבילת פינג חי לפני שאנחנו מנסים להתחבר מחדש?"
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "מעקף Jabberd2"
 
 # INTERESTING!
 # option (אפשרות), not entry (רשומה)
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -6026,7 +6274,7 @@ msgstr ""
 "כאשר מסומן, Gajim יעשה שימוש בכתובת IP ובצירים (proxy) שהוגדרו על ידך "
 "באפשרות file_transfer_proxies לשם העברת קובץ."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
@@ -6034,20 +6282,20 @@ msgstr ""
 "כאשר מופעלת, Gajim יבחן צירי (proxy) העברת קובץ בעת הפעלה כדי לוודא כי זו "
 "אכן פועלת. ידוע כי מתווכי Openfire נכשלים בבחינה זו אפילו אם אלו עובדים."
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "מענה לבקשות קבלה"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "בקשות קבלה אשר נשלחו"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "התר ל־Gajim לשלוח מידע אודות מערכת ההפעלה אשר בשימושך."
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "התר ל־Gajim לשלוח את הזמן המקומי שלך."
 
@@ -6055,7 +6303,7 @@ msgstr "התר ל־Gajim לשלוח את הזמן המקומי שלך."
 # מתקיימת הסדרה לסשן
 # מתקיימת הסדרת סשן
 # שרצונך הוא
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -6063,11 +6311,11 @@ msgstr ""
 "כאשר מתקיים משא ומתן עבור סשן מוצפן, האם על Gajim להניח כי ברצונך שההודעות "
 "שלך יירשמו?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "הודעה אשר תישלח לאנשי קשר אותם ברצונך להוסיף"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
@@ -6076,7 +6324,7 @@ msgstr ""
 "על ידי משאבים אחרים."
 
 # BUG: can directly connect to
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
@@ -6084,22 +6332,22 @@ msgstr ""
 "כאשר מופעלת, Gajim ישלח את כתובות IP מקומיות שלך, כך שהאיש קשר שלך יוכל "
 "להתחבר ישירות למחשב שלך כדי להעביר קבצים."
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "האות האחרון עבור אימות Oauth2."
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "‏client_id עבור אימות Oauth2."
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "‏redirect_url עבור אימות Oauth2."
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
@@ -6107,17 +6355,27 @@ msgstr ""
 "רשימה אשר מופרדת על ידי רווח, של כתובות JID עבורן אנו רוצים לפתוח מחדש חלון "
 "שיחה בהפעלה הבאה."
 
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
 # אשר ברצוננו
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "שפה עבורה אנחנו רוצים לבדוק מילים אשר לא מאויתות כראוי"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
 # ללא
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
@@ -6125,7 +6383,7 @@ msgstr ""
 "כמה שורות לבקש מתוך שרת בעת כניסה לשיחת קבוצה. 1- מסמל אי הגבלה, 2- מסמל ערך "
 "גלובלי"
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
@@ -6134,11 +6392,11 @@ msgstr ""
 "כמה דקות לאחור לבקש רשומות בעת התחברות לשיחת קבוצה. 1- מסמל אי הגבלה, 2- "
 "מסמל ערך גלובלי"
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
@@ -6149,79 +6407,79 @@ msgstr ""
 "משתמש גרפי במקום."
 
 # יושן
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "ישן"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "אשוב בקרוב"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "אני אחזור בעוד כמה דקות."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "אוכל"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "אני בהפסקת אוכל, אז תשאירו לי הודעה."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "סרט"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "אני צופה בסרט."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "עובד"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "אני בעבודה."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "טלפון"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "אני בטלפון."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "בחוץ"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "יצאתי החוצה ליהנות מן החיים."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "אני זמין/ה."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "אני פנוי/ה לשיחה."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "אני לא זמין/ה."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "נא לא להפריע."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "להתראות!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6229,28 +6487,28 @@ msgstr ""
 "צליל לניגון כאשר הודעת שיחת קבוצה מכילה אחת מתוך המילים אשר מצוינות בתוך "
 "muc_highlight_words, או כאשר הודעת שיחת קבוצה מכילה את השם כינוי שלך."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "צליל לניגון כאשר הודעת שמ״מ מגיעה."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "ירוק"
 
 # מכולת
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "מצרכים"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "אנושי"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "ימי"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 msgid "Tor"
 msgstr ""
 
@@ -6333,37 +6591,50 @@ msgstr "כל ההודעות אשר לא נקראו קודמו."
 msgid "Forward unread message then disconnect"
 msgstr "קדם הודעות אשר לא נקראו והתנתק לאחר מכן"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "קובץ ריק"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "קובץ לא קיים"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "כעת יוצר רשומות מסד נתונים"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "כעת יוצר מטמון מסד נתונים"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "שלח את %s אל %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "‏%s הינו קובץ אך אמור להיות מדור"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 #, fuzzy
 msgid "Gajim will now exit"
 msgstr "cli"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "‏%s הינו מדור אך אמור להיות קובץ"
@@ -6374,11 +6645,11 @@ msgstr "‏%s הינו מדור אך אמור להיות קובץ"
 msgid "Error: cannot open %s for reading"
 msgstr "שגיאה: אין אפשרות לפתוח את %s לקריאה"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr ""
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "cli"
@@ -6388,196 +6659,196 @@ msgstr "cli"
 msgid "%s is not a valid loglevel"
 msgstr "cli"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "אין אפשרות לקבל תעודת מנפיק"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "אין אפשרות לקבל תעודת CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "אין אפשרות לפענח חתימת תעודה"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "אין אפשרות לפענח חתימת CRL"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "אין אפשרות לפענח מפתח ציבורי של מנפיק"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "כשל תעודת חתימה"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "כשל חתימת CRL"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "התעודה אינה תקפה עדיין"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "התעודה פקעה"
 
 # CRL what? (Certificate?)
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "‏CRL אינה תקפה עדיין"
 
 # CRL what? (Certificate?)
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "‏CRL פקעה"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "שגיאת תסדיר בשדה notBefore של התעודה"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "שגיאת תסדיר בשדה notAfter של התעודה"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "שגיאת תסדיר בשדה lastUpdate של CRL"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "שגיאת תסדיר בשדה nextUpdate של CRL"
 
 # זיכרון אזל
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "לא נותר זיכרון"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "תעודה חתומה באופן עצמי"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "תעודה חתומה באופן עצמי בתוך שרשרת תעודה"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "אין אפשרות לקבל תעודת מנפיק מקומית"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "אין אפשרות לאמת את התעודה הראשונה"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "שרשרת תעודה ארוכה מדי"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "התעודה בוטלה"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "תעודת CA חסרת תוקף"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "מגבלת אורך נתיב מוצתה"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "תכלית תעודה לא נתמכת"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "התעודה אינה מהימנה"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "התעודה נדחתה"
 
 # התניית המנפיק אינה תואמת
 # תוכן/נושא מנפיק אינו תואם
 # קיימת אי תיאום עם/ב
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "נושא מנפיק לא תואם"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "רשות ונושא מזהה מפתח לא תואמים"
 
 # ומספר מנפיק סידורי
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "רשות ומספר סידורי של מנפיק לא תואמים"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "שימוש מפתח לא כולל חתימת תעודה"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "כשל אימות פניה"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "החיבור עם חשבון \"%s\" אבד"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "התחבר ידנית."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "שרת %(name)s ענה באופן שגוי לבקשת rhauo: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "שרת %s סיפק טופס רישום שונה"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "לא היתה אפשרות להתחבר למארח \"%(host)s\" דרך ציר \"%(proxy)s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "לא היתה אפשרות להתחבר אל \"%(host)s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "תגובת שרת: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "התחברות אל proxy נכשלה"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "לא היתה אפשרות להתחבר לחשבון %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "החיבור עם חשבון %s אבד. כעת מנסה להתחבר מחדש."
 
 # חסרת תוקף
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "אמינותה של התעודה %s עלולה להיות רעועה"
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6586,7 +6857,7 @@ msgstr ""
 "\n"
 "שגיאת SSL: ‏<b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6596,7 +6867,7 @@ msgstr ""
 "שגיאת SSL לא מוכרת: %d"
 
 # שם תחום
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -6605,33 +6876,33 @@ msgstr ""
 "אמינותה של התעודה %s עלולה להיות רעועה.\n"
 "תעודה זו לא מכסה את מתחם זה."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "לא היתה אפשרות להתחבר אל \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "אימות עם \"%s\" נכשל"
 
 # נכונות
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "אנא בדוק תקינות התחברות וסיסמה."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "איש קשר אשר נשלח: \"%s\" ‏(%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "אנשי קשר אשר נשלחו:"
 
 # נתון להשגה/לביצוע/בהישג יד
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "לא מובא בשל מצב בלתי נראה"
 
@@ -7536,191 +7807,216 @@ msgstr "קלט וידאו"
 msgid "video output"
 msgstr "פלט וידאו"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "שרת מוכרח להיות בין 1 עד 1023 תווים"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "תו שגוי בשם מארח."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "נדרשת כתובת שרת."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "שם משתמש מוכרח להיות בין 1 עד 1023 תווים"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "תו שגוי בתוך שם משתמש."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "משאב מוכרח להיות בין 1 עד 1023 תווים"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "תו שגוי במשאב."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_עסוק"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_לא זמין"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_חופשי לשיחה"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "_זמין"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "מתחבר כעת"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_נעדר"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "לא מ_קוון"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_בלתי נראה"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "לא ידוע"
+
+# Has>Contain
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "מכיל שגיאות"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "ללא"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "אל"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "מן"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "הדדית"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "אין"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "הרשמה"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "אין"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "אחראים"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "אחראי"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "משתתפים"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "משתתף"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "מבקרים"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "מבקר"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "קשוב/ה כעת לשיחה"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "עושה כעת משהו אחר"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "כותב/ת כעת הודעה..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "חדל/ה מלהלחין הודעה"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "סגר/ה את כרטיסיית או חלון השיחה"
 
 # גיבי בתים
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s גי״ב"
 
 # גיגה בתים
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s ג״ב"
 
 # מיבי בתים
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s מי״ב"
 
 # מגה בתים
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s מ״ב"
 
 # קיבי בתים
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s קי״ב"
 
 # קילו בתים
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s ק״ב"
 
 # בתים
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s ב"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "ממתינה לך הודעה %d"
 msgstr[1] "ממתינות לך %d הודעות"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " בחדר %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " מאת המשתמש %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " מאת %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7728,73 +8024,73 @@ msgstr[0] "אירוע %d תלוי ועומד"
 msgstr[1] "%d אירועים תלויים ועומדים"
 
 # In Hebrew: גאג'ים
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "‫Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "‫Gajim - ‫%s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "ברצוני להוסיף אותך לרשימת הקשר שלי."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "שלום, שמי $name."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "תם הזמן אשר הוקצב לטעינת תמונה"
 
 # BUG: File too big
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "התמונה הינה גדולה מדי"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr "‏PyCURL אינה מותקנת"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 msgid "Error loading image"
 msgstr "שגיאה בטעינת תמונה"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "מידע רישום עבור המוביל %s לא הגיע בזמן"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "הודעה"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "ברצוני להוסיף אותך לרשימה שלי."
 
@@ -7832,45 +8128,45 @@ msgstr ""
 "אפיק מערכת אינו זמין.\n"
 "נסה לקרוא את %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "אנא בדוק כי Avahi או Bonjour מותקן במערכת."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "לא היתה אפשרות להתחיל שירות מקומי"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "אין אפשרות לכרוך לפורט %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "אנא בדוק כי avahi-daemon מורץ כעת."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "לא היתה אפשרות לשנות מצב של חשבון \"%s\""
 
 # הודעתך לא יכולה להישלח.
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "לא היתה אפשרות לשלוח את הודעתך זו."
 
 # לא מחובר
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "איש קשר לא מקוון. לא היתה אפשרות לשלוח את הודעתך זו."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "לא היתה אפשרות לבסס חיבור למארח: תם הזמן בעת שליחת מידע."
@@ -8112,6 +8408,11 @@ msgstr "א_סור"
 msgid "_Add to Roster"
 msgstr "הו_סף לרשימה"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "הרץ _פקודה"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8393,11 +8694,11 @@ msgstr "אודות"
 msgid "Con_tinue"
 msgstr "ה_משך"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "ה_שהה"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_ביטול"
@@ -8406,31 +8707,31 @@ msgstr "_ביטול"
 msgid "_Open Containing Folder"
 msgstr "_פתח תיקיה מכילה"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "העברות קבצים"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "רשימת העברת קבצים"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "רשימה של העברות קבצים מושהות, מושלמות ופעילות"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_נקה"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "הסרת העברות קבצים שלמות, מבוטלות וכושלות מתוך הרשימה"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "הסר העברת קובץ מתוך הרשימה."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8438,32 +8739,37 @@ msgstr ""
 "פעולה זו מסירה העברת קובץ בודדת מתוך הרשימה. כאשר ההעברה פעילה, היא תיעצר "
 "תחילה ולאחר מכן היא תוסר"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "ביטול העברת קובץ נבחר והסרת קבצים לא שלמים"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "ביטול העברת קובץ"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "ביטול העברת קובץ נבחרת"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_שלח וסגור"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "הסתרת חלון"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "הו_דע לי כאשר העברת קובץ הושלמה"
 
 # תושלם, מושלמת
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "הצג התראה מוקפצת כאשר העברת קובץ הושלמה"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "הצגת רשימה של העברות קבצים בינך לבין אחרים"
 
@@ -8474,7 +8780,7 @@ msgid "Register to"
 msgstr "רישום אל"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_אישור"
 
@@ -8506,20 +8812,20 @@ msgstr "גופן"
 msgid "Clear formatting"
 msgstr "איפוס עיצוב"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "הצגת רשימת רגשונים (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "הצפנת סיסמה"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "הצגת רשימת רגשונים (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "טיפוס אירוע"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "תיאור אירוע"
 
@@ -8581,7 +8887,7 @@ msgstr "<b>גופן</b>"
 msgid "<b>#</b>"
 msgstr "<b>גופן</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr ""
 
@@ -9327,10 +9633,6 @@ msgstr "_פתח..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>עורך תצורה מתקדם</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "מתקדם"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "התחל _שיחה"
@@ -9573,7 +9875,7 @@ msgid "_Open Email Composer"
 msgstr "_פתח מלחין דוא״ל"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "התחל _שיחה"
 
@@ -9620,6 +9922,10 @@ msgstr "העדפות"
 msgid "Default:"
 msgstr "ברירת מחדל"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "הוספת איש קשר חדש"
@@ -9645,6 +9951,16 @@ msgstr "שם כי_נוי:"
 msgid "_Group:"
 msgstr "_קבוצה:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "מזהה משתמש:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "שם כינוי"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9686,6 +10002,11 @@ msgstr ""
 "עליך להתחבר למוביל בכדי שתעמוד לרשותך\n"
 "האפשרות להוסיף איש קשר מתוך פרוטוקול זה."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_שנה הודעת מצב"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>מצב רוח:</b>"
@@ -9903,10 +10224,9 @@ msgstr "הרץ _פקודה..."
 msgid "_Verify"
 msgstr "_אמת"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "חשבונות"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(מידע <b>ESession</b>)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9933,11 +10253,6 @@ msgstr "הצג אנשי קשר _פעילים בלבד"
 msgid "Show Transports"
 msgstr "הצג מו_בילים"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "העברות קבצים"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -10008,49 +10323,34 @@ msgstr "מ_זער בעת הצטרפות אוטומטית"
 msgid "Pr_int status:"
 msgstr "ה_דפס מצב:"
 
-#: gajim/data/gui/exception_dialog.ui:7
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Exception"
-msgstr "תיאור"
+msgid ""
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
+msgstr "שגיאה זו אינה חמורה ככל הנראה, אך בכל זאת צריך לדווחה למפתחים."
 
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:115
 #, fuzzy
 msgid "Report Bug"
 msgstr "_דווחו על בעיה"
 
-#: gajim/data/gui/exception_dialog.ui:89
-#, fuzzy
-msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
-msgstr "שגיאה זו אינה חמורה ככל הנראה, אך בכל זאת צריך לדווחה למפתחים."
-
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "בקשת הרשמה"
-
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_אסור"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "איסור הרשאות מאיש קשר כך שזה לא יוכל לדעת מתי אתה מחובר"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_פעולות"
-
 # הס_מך
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "אש_ר"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "הענקת הרשאה לאיש קשר כדי שזה ידע מתי אתה מחובר"
 
@@ -10068,11 +10368,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_נוכחות"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "הזמנת ידידים!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -10081,15 +10381,20 @@ msgstr ""
 "בחרת להתחיל שיחה מרובת משתתפים.\n"
 "בחר את אנשי הקשר אותם ברצונך להזמין"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "אנא בחר שרת שמ״מ."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "שרת MUC (שיחה מרובת משתתפים)"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "ה_זמן"
 
@@ -10214,11 +10519,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "מנקה"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10387,6 +10687,15 @@ msgstr "הצג _אירועים ממתינים"
 msgid "Mute Sounds"
 msgstr "דומם _צלילים"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "העדפות"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr ""
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "לכבוד:"
@@ -10792,15 +11101,6 @@ msgstr "להחליף?"
 msgid "Configuration"
 msgstr "תצורה"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-#, fuzzy
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr "צ'אט;מסרים;מסנג'ר;jabber;xmpp;bonjour;voip"
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "לקוח מסרים מידיים Jabber"
@@ -10929,6 +11229,37 @@ msgstr "אחרונים:"
 msgid "Plugin manager"
 msgstr "כשל תוסף"
 
+# Maybe an RTL issue would show up
+# Needs to be tested
+#, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "חשבון XMPP ‫%s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "תיאור"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>מישהו@איפשהו.קום</b> מעוניין <b>להוסיף</b> כמה אנשי קשר חדשים לרשימה "
+#~ "שלך."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "רשימה סדורה (מופרדת על ידי רווח) של טיפוס חיבור לנסות. יכול להכיל tls, "
+#~ "ssl או plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_פעולות"
+
+#, fuzzy
+#~ msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+#~ msgstr "צ'אט;מסרים;מסנג'ר;jabber;xmpp;bonjour;voip"
+
 # השעיית התליית
 #~ msgid "Ability to disconnect properly just before suspending the machine."
 #~ msgstr "יכולת להתנתק באופן מוסדר בטרם השהיית המחשב."
@@ -11153,12 +11484,6 @@ msgstr "כשל תוסף"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "הסתרת לחצני שיחה"
 
-#~ msgid "File is empty"
-#~ msgstr "קובץ ריק"
-
-#~ msgid "File does not exist"
-#~ msgstr "קובץ לא קיים"
-
 # הטמון
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
@@ -11185,67 +11510,6 @@ msgstr "כשל תוסף"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "יש צורך בהתקנת python-pyopenssl > 0.12 וגם pyasn1."
 
-#~ msgid "?user status:_Available"
-#~ msgstr "_זמין"
-
-#~ msgid "?user status:Available"
-#~ msgstr "זמין"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "לא ידוע"
-
-# Has>Contain
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "מכיל שגיאות"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "ללא"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "אין"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "אין"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "ללא"
-
-#~ msgid "?print_status:All"
-#~ msgstr "הכל"
-
-#~ msgid "?print_status:None"
-#~ msgstr "אל תדפיס"
-
-#~ msgid "?features:Available"
-#~ msgstr "זמינות"
-
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "שיחות קבוצה"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "הורדה"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "העלאה"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "הושהתה"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "לא ידוע"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "לא ידועה"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "לא ידוע"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "<b>תפקיד:</b>"
-
 #, fuzzy
 #~ msgid "Credentials"
 #~ msgstr "אישורי Oauth2"
@@ -11469,9 +11733,6 @@ msgstr "כשל תוסף"
 #~ msgid "Choose _Key..."
 #~ msgstr "בחר _מפתח..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "השתמש בסוכן G_PG"
-
 # BUG: a dot at the end
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
@@ -11608,18 +11869,6 @@ msgstr "כשל תוסף"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>קלט XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "סינון:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>קלט XML</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_שלח"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "מסוף ‫XML עבור ‫%s"
 
@@ -12076,9 +12325,6 @@ msgstr "כשל תוסף"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "צפייה במידע איש קשר (Ctrl+I)"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(מידע <b>ESession</b>)"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "כתובת JID או שם איש קשר"
 
@@ -12094,13 +12340,6 @@ msgstr "כשל תוסף"
 #~ msgid "homepage url"
 #~ msgstr "כתובת עמוד בית"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>מישהו@איפשהו.קום</b> מעוניין <b>להוסיף</b> כמה אנשי קשר חדשים לרשימה "
-#~ "שלך."
-
 #~ msgid "More"
 #~ msgstr "עוד"
 
@@ -12122,13 +12361,6 @@ msgstr "כשל תוסף"
 #~ msgid "Please check if avahi/bonjour-daemon is running."
 #~ msgstr "אנא בדוק כי avahi-daemon מורץ כעת."
 
-#~ msgid ""
-#~ "<b>Message was corrected. Last message was:</b>\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "<b>הודעה תוקנה. הודעה אחרונה היתה:</b>\n"
-#~ "  %s"
-
 #~ msgid "%s is not the name of a group chat."
 #~ msgstr "‫%s אינו שם של שיחת קבוצה."
 
diff --git a/po/hr.po b/po/hr.po
index 41cca654e..79f0f6411 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-10-31 20:49+0100\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -29,20 +29,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Greška."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Zaista pošalji datoteku?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Ako pošaljete datoteku osobi %s, on/ona će znati vaš pravi Jabber ID."
@@ -98,70 +98,70 @@ msgstr "Vrijeme"
 msgid "Progress"
 msgstr "Napredak"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "veličina: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Vi"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošiljatelj: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Primatelj: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Spremljeno u: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Prijenos datoteka završen"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Otvaranje Mape Sadržaja"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Prijenos datoteka otkazan"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Vezu nije moguće ostvariti."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primatelj: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka Greške: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Razmjena datoteka zaustavljena"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -169,126 +169,126 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Odabir Datoteke za Slanje..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Opis: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Datoteka sa ovim imenom već postoji i nemate ovlasti prepisati ju."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Å to želite učiniti?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U direktorij \"%s\" nije moguće zapisivati"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Snimiti Datoteku kao..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vam želi poslati datoteku:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Šaljem profil..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Neispravna Datoteka"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Datoteka: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Ime: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Pošiljatelj: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pauza"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Nastaviti"
 
@@ -449,44 +449,65 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Potreban je python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Dostupan"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Funkcija"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Greška pri učitavanju datoteke:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Produžetak nije podržan"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Sliku nije moguće spremiti u %(type)s formatu. Spremiti kao %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Snimiti Sliku kao..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Imam "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Klijent:Nepoznat"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Nepoznat"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Vrijeme:Nepoznato"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pripadnost:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -495,7 +516,7 @@ msgstr ""
 "Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -504,13 +525,13 @@ msgstr ""
 "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/"
 "njega ne interesira vaše prisutstvo"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Vi i vaš kontakt ste zainteresirani za informacije o prisustvu jedno drugog"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -518,27 +539,37 @@ msgid ""
 msgstr ""
 "Vi i vaš kontakt ste zainteresirani za informacije o prisustvu jedno drugog"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Sve datoteke"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Čistim"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Podešavanje Proxy Profila"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -581,13 +612,13 @@ msgid "_New Group Chat"
 msgstr "_Novi Grupni Razgovor"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Nije na Listi Kontakata"
 
@@ -600,7 +631,7 @@ msgstr "Želio bih vas dodati na svoju listu kontakata"
 msgid "Send Single _Message…"
 msgstr "Pošalji Jednu _Poruku"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Postavi Prila_gođeni Status"
@@ -618,25 +649,25 @@ msgstr "_Upravljanje Prijenosom"
 msgid "_Modify Transport"
 msgstr "_Izmjeni Prijenos"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Preimenuj"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Uklo_ni"
@@ -650,203 +681,223 @@ msgstr "_Informacije"
 msgid "Send File..."
 msgstr "Pošalji _Datoteku..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Pozovi _Kontakte"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Dodaj na Listu"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Informacije"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Povijest razgovora"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Upravljanje sobom"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Promijeni _Temu..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Podešavanje _Sobe..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Uništi Sobu"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Promijeni _Nadimak..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Postavi knjižnu oznaku za sobu"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Glas"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Predefinirane poruke:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimiziraj kod izlaza"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Izvrši Naredbu..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Odspoji"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Dodaj Kontakt..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "datoteka"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Otkrivanje Usluga"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "_Slanje Jedne Poruke..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Napredno"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Postavke"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sinkroniziraj"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Poslužitelj"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Admin"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Pošalji Poslužiteljsku Poruku..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Postavi MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Osvježi MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Izbriši MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Nema dostupnih računa"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Korisnički Račun"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "poruka"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Emotikoni:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći bazu podataka zapisa"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Poruka"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -854,7 +905,7 @@ msgstr ""
 "Želite li očistiti bazu podataka? (NE PREPORUČUJEMO UKOLIKO JE GAJIM "
 "POKRENUT)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -869,100 +920,100 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, pričekajte..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Pogreška Baze Podataka"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Izvozim Zapise..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s kaže: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Da li zaista želite ukloniti odabranu poruku?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Da li zaista želite ukloniti zabilješke odabranog kontakta?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Usluga nije pronađena"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Otkaži potvrdu"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Da li zaista želite ukloniti odabranu poruku?"
 msgstr[1] "Da li zaista želite ukloniti odabrane poruke?"
 msgstr[2] "Da li zaista želite ukloniti odabrane poruke?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Ovo je nepovratna operacija."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Dohvaćam profil..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informacije Kontakta"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: GGGG-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Primljene informacije"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Bez veze ne možete objaviti informacije o sebi"
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Šaljem profil..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Objava vCard neuspješna"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -980,10 +1031,10 @@ msgstr "Ime kontakta: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Općenito"
@@ -1070,36 +1121,36 @@ msgstr "Molim ispunite podatke kontakta kojeg želite dodati za račun %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Neispravan Korisnički ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Nemoguće dodati samog sebe na vlastitu listu."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakt je već na listi"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ID Korisnika:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Greška prilikom dodavanja usluge. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1107,52 +1158,52 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "GTK+ Jabber klijent"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ Verzija:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK Verzija:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Trenutni Razvojni Programeri:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Prošli Razvojni Programeri:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Zadnje, ali ne najmanje, željeli bismo se zahvaliti svim održavateljima "
 "paketa"
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Adrian C. <anrxc@sysphere.org>\n"
@@ -1160,12 +1211,12 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1177,12 +1228,12 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Nesigurna Veza"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1193,310 +1244,334 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
 "instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, stvarno želim nesigurno povezivanje"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Nadimak sadrži nedozvoljene znakove."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Zahtjev za Pretplatom"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtjev za pretplatu na račun %(account)s od %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Neispravna soba"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Neispravan Nadimak"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Molim napravite novu temu sa vašim željenim imenom."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Neispravan JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se pridružiti grupnom razgovoru ukoliko niste spojeni."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Krivi uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Ovo nije grupni razgovor"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Ime"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Ovaj račun nije spojen sa poslužiteljem"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete sinkronizirati sa računom ukoliko nije spojen."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Nastavljeni razgovor"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Novi Grupni Razgovor"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Dodaj Novi Kontakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promjena lozinke."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Morate unesti lozinku."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakt Se Prijavio"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nova Poruka"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nova Jedna Poruka"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molim potvrdite da ste spojeni na \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nije moguće poslati poruku na %s, ovaj JID nije ispravan."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Čistim"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filter:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML Unos</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Pošalji"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Tužan"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Uredi"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "Uklo_ni"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%s</b> želi da <b>%s</b> neke kontakte na vašoj listi."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Dodaj"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Uredi"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Obriši"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Grupe"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s vas je preporučio za dodavanje na moju listu kontakata."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1504,7 +1579,7 @@ msgstr[0] "_Dodaj kontakt"
 msgstr[1] "_Dodaj kontakt"
 msgstr[2] "_Dodaj kontakt"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1512,181 +1587,181 @@ msgstr[0] "Uklanja kontakt sa liste"
 msgstr[1] "Uklanja kontakt sa liste"
 msgstr[2] "Uklanja kontakt sa liste"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Postavke"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Servis je odgovorio sa greškom."
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Greška"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista Privatnosti <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Lista Privatnosti"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Redoslijed: %(order)s, akcija: %(action)s, tip: %(type)s, vrijednost: "
 "%(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosljed: %(order)s, akcija: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmjena pravila</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste Privatnosti za %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Neispravno Ime Liste"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vas je pozvao da se uključite u raspravu."
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact vas je pozvao na grupni razgovor %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Želite li prihvatiti poziv?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Odabir Zvuka"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav Zvuci"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Odabir Slike"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Slike"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Odabir Slike"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Sve datoteke"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje Posebne Obavijesti za %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "za račun %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1710,68 +1785,96 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Greška SSL certifikata"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Prijenosi Datoteka"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Enkripcija onemogućena"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Više niste u grupnom razgovoru \"%(room)s\" ili je \"%(nick)s\" otišao."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Molim specificirajte novu temu:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molim specificirajte novi nadimak ako ga želite koristiti:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Neispravan Jabber ID grupnog razgovora"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1780,268 +1883,278 @@ msgstr ""
 "Definitivno će te uništiti ovu sobu.\n"
 "Ispod možete navesti razlog:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "i autentičan"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "i NIJE autentičan"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s enkripcija %(status)s aktivna %(authenticated)s.\n"
 "Vaš razgovor %(logged)s biti zapisan."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Razgovor sa"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svakom sudioniku je sada dopušteno da vidi vaš puni JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Soba od sada prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "Soba od sada ne prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Soba je sada non-anonymous"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada semi-anonymous"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Soba je sada fully-anonymous"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Zapisivanje razgovora u sobi je omogućeno"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Nova soba je stvorena"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Poslužitelj je dodijelio ili promjenio vaš nadimak"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup od strane %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "pripadnost promjenjena"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe promjenjena na members-only"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "zaustavljanje sustava"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Pripadnost %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Pripadnost %(nick)s je postavljena na %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, biti ćete odspojeni iz ovog grupnog razgovora."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Prijenosi Datoteka"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Prijenosi Datoteka"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Prikaži popis formata"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ovaj kontakt ne podržava prijenosa datoteka."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s iz grupnog razgovora %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Pregovaranje o sesiji neuspješno"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sesija NEĆE biti sačuvana"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Ova razgovor je kriptiran"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr "i biti ĆE sačuvana"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti sačuvana"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Identitet druge strane nije potvrđen. Kliknite na ikonu štita za detalje."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2049,7 +2162,7 @@ msgstr ""
 "Ako zatvorite ovu karticu, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2058,7 +2171,7 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2067,96 +2180,96 @@ msgstr ""
 "Nemoguće dekriptirati poruke od %s\n"
 "Možda ih je netko izmjenio."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je trenutno %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "veličina: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Prihvati"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Pridruživanje"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Druga strana je prekinula prijenos"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Greška pri čitanju datoteke"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Grupni Razgovori"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Prijenosi"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Odobrenje je poslano"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako \"%s\" prihvati ovaj zahtjev znati će te njegov/njezin status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2164,11 +2277,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2176,38 +2289,38 @@ msgstr ""
 "Promjena vašeg statusa u nevidljivo rezultirati će odspajanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "desinkroniziran"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Zaista zatvori Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Uvijek zatvori Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Prekini transfer datoteke"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Imte nepročitane poruke"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2215,16 +2328,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu "
 "povijest i kontakt je na vašoj listi."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2232,11 +2345,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2245,11 +2358,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovih "
 "prijenosa: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Spremate se blokirati kontakt. Jeste li sigurni da želite nastaviti?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2258,56 +2371,56 @@ msgstr ""
 "Uvijek će te biti nedostupni za ovaj kontakt, i poruke koje pošalje nećete "
 "primiti."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Ukloni Grupu"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno ukloni i sve kontakte iz ove grupe sa liste kontakata"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Dodjeli OpenPGP Ključ"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za dodavanje kontaktu"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" biti će uklonjen sa vaše liste kontakata"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Spremate se ukloniti \"%(name)s\" (%(jid)s) sa vaše liste kontakata.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2317,11 +2430,11 @@ msgstr ""
 "ujedno uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek "
 "vidjeti kao da ste odspojeni."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2330,15 +2443,15 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno po pretpostavljenom uklanjate i odobrenje "
 "što konačno znači da će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status nakon uklanjanja"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2348,14 +2461,14 @@ msgstr ""
 "ujedno uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek "
 "vidjeti kao da ste odspojeni."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Spremate se poslati osobni status. Jeste li sigurni da želite nastaviti?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2364,25 +2477,25 @@ msgstr ""
 "Privremeno će te za ovaj kontakt imati status %(status)s, sve dok ne "
 "promijenite vaš status. Tada će vidjeti vaš globalni status."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate stvoriti račun prije nego što možete razgovarati sa drugim kontaktima."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2391,13 +2504,13 @@ msgstr ""
 "Vaš poslužitelj ne podržava spremanje informacija metakontakata. Te "
 "informacije neće biti spremljene kod sljedećeg spajanja."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2407,11 +2520,11 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2419,183 +2532,183 @@ msgstr[0] "Želite li poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Želite li poslati ove datoteke kontaktu %s:"
 msgstr[2] "Želite li poslati ove datoteke kontaktu %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Poslati %s prema %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Učini %s i %s pseudokontaktima"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Učini %s i %s pseudokontaktima"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Objavi Glazbu"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi Glazbu"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Postavi Usluge..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maksimiziraj Sve"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Pošalji _Grupnu Poruku"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Svim spojenim korisnicima"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Upravljanje Kontaktima"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Izmjeni _Grupe"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maksimiziraj"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Ponovno spajanje"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Odspoji"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Povijest razgovora"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Upravitelj Zapisima"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Pridruži se Novom Grupnom Razgovoru"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Izmjena Statusne Poruke"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Koristi t_ray ikonu"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Prikaži samo u _listi kontakata"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Napredni Uređivač Postavki"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Konfiguracija Sobe"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Pogreška Baze Podataka"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Å to želite učiniti?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Povezujem"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Proslijedi nepročitane poruke"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2604,7 +2717,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2612,7 +2725,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2758,16 +2871,16 @@ msgstr "Emotikoni onemogućeni"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
@@ -2799,10 +2912,18 @@ msgstr "Ukloni račun sam_o iz Gajima"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?ispis_statusa:Sve"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Samo ulasci i izlasci"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?ispis_statusa:Ništa"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
@@ -2868,11 +2989,11 @@ msgstr "Neispravan unos"
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certifikat je već na listi"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ovaj certifikat je već u datoteci %s, neće biti ponovno dodan."
@@ -2976,90 +3097,113 @@ msgstr "Označavanje Poruke Grupnog Razgovora"
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Član"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr "[blokirano]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr "[minimizirano]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Spojen"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Odspojen"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Skidanje"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Podizanje"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Tip: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Nije početo"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Zaustavljeno"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Završeno"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?status prijenosa:Stanka"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Zaustavljeno"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Prenosim"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?status prijenosa:Stanka"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Odsutan"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Zauzet"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Odspojen"
 
@@ -3108,125 +3252,129 @@ msgstr "(Nema)"
 msgid "Hidden"
 msgstr "Skrivena"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Povijest Razgovora sa %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Povijest razgovora"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Greška"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stauts je trenutno: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Izmjena Statusne Poruke"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Podešavanje Knjižnih Oznaka"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "na _listi"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Prikaži _Listu Kontakata"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nije moguće učitati modul idle"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nevidljivost nije podržana"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "novi@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novi%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Ime poslužitelja:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Mogućnosti Poslužitelja"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Odgovor poslužitelja: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3386,7 +3534,7 @@ msgstr "_Pretplatiti se"
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3394,51 +3542,57 @@ msgstr ""
 "Tekst niže od ove linije je ono što je rečeno od kad ste\n"
 "zadnji puta obraćali pozornost na ovaj grupni razovor"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Citat"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u riječnika nedostaje \"%s\" i nije WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Neispravan JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3451,30 +3605,35 @@ msgstr[2] "Jučer"
 msgid "Write a message.."
 msgstr "Nova Privatna Poruka"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Zatvorit će te nekoliko kartica"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Da li ih zaista želite sve zatvoriti?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Grupni Razgovori"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Poruke"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3486,109 +3645,109 @@ msgstr ""
 "registriran od strane drugog učesnika.\n"
 "Molimo unesite drugi nadimak ispod:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "U slučaju konflikta uvijek koristi ovaj nadimak"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Prihvaćate li ovaj zahtjev?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvaćate li ovaj zahtjev na računu %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Potrebna je lozinka za pridruživanje grupnom razgovoru %s. Molim unesite je."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Font</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Grupni razgovor %s ne postoji."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Grupni razgovor %s ne postoji."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Stvaranje grupnih razgovora je ograničeno."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Morate koristiti vaš registrirani nadimak u grupnom razgovoru %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Zahtjev za pretplatom"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3597,31 +3756,31 @@ msgstr ""
 "Uvijek ćete vidjeti njega ili nju kao odspojenu.\n"
 "Želite li ukloniti njega ili nju sa vaše liste kontakata?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Pretplata uklonjena"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Provjerite svoju vezu ili pokušajte kasnije."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3630,36 +3789,36 @@ msgstr ""
 "Postavili ste Gajim da koristi GPG agent, ali GPG agent nije pokrenut ili je "
 "odgovorio sa krivom lozinkom.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste spojeni bez OpenPGP ključa."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Kriva Lozinka"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Kriva Lozinka"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikat je istekao"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Unesite GPG lozinku za ključ %(keyid)s (račun %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3668,97 +3827,102 @@ msgstr ""
 "GPG ključ koji se koristi za kriptiranje ovog razgovora nije pouzdan. Zaista "
 "želite kriptirati ovu poruku?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Greška SSL certifikata"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspješno ste poslali %(filename)s %(name)s"
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Odabir Datoteke za Slanje..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Nemoguće dekriptirati poruku"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Molim unesite novo korisničko ime za vaš lokalni račun"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Konflikt Resursa"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Već ste spojeni na ovaj račun sa istim resursom. Molim unesite novi."
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Greška kod ovjere SSL certifikata"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3769,7 +3933,7 @@ msgstr ""
 "%(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3782,15 +3946,15 @@ msgstr ""
 "SHA1 otisak certifikata:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriraj ovu grešku za ovaj certifikat."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3811,7 +3975,7 @@ msgstr ""
 "\n"
 "Još uvijek se želite povezati i korigirati otisak certifikata?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3819,7 +3983,7 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
 "instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3828,33 +3992,33 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nekriptirane veze. Jeste li sigurni "
 "da želite nastaviti?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Ovo nije grupni razgovor"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Postavljena tema emotikona nije pronađena, emotikoni su onemogućeni."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr "Postavljena tema emotikona nije pronađena, emotikoni su onemogućeni."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3862,41 +4026,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "predefinirano"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Potrebna Lozinka"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite GPG lozinku za ključ %(keyid)s (račun %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG ključ istekao"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vaš GPG ključ je istekao, biti će te spojeni na %s bez OpenPGP-a."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Kriva Lozinka"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
@@ -3968,6 +4132,11 @@ msgstr "- poruke će biti zapisane"
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti zapisane"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3999,7 +4168,7 @@ msgstr "Neispravna soba"
 msgid "The form is not filled correctly."
 msgstr "Nadimak sadrži nedozvoljene znakove."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -4131,6 +4300,57 @@ msgstr ""
 "%s\n"
 "Poruke lokalne veze možda ne rade kako treba."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Nije moguće pokrenuti lokalnu uslugu"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nemogu učitati sliku"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Servis je odgovorio sa greškom."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Nemogu učitati sliku"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Enkripcija omogućena"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Veza nije dostupna"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4156,7 +4376,17 @@ msgstr "Ne možete izbrisati svoju trenutnu temu"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Spojeni računi"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Koristi G_PG Agent"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
@@ -4180,6 +4410,11 @@ msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Ukloni"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4373,51 +4608,65 @@ msgstr "Promijeni Password"
 msgid "Login Options"
 msgstr "_Emotikoni:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus nije namješten na ovom sustavu ili nema python modula."
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "naredba"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Prikazuje prozor sa sljedećim događajem na čekanju"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Ispisuje listu svih kontakata na listi. Svaki kontakt pojavljuje se u "
 "odvojenoj liniji"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "račun"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "prikaži samo kontakte ovog računa"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registriranih računa"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Mjenja status jednog računa ili više njih"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4426,11 +4675,17 @@ msgstr ""
 "jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, ne "
 "uznemiravaj, nevidljiv"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "poruka"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "statusna poruka"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4439,16 +4694,21 @@ msgstr ""
 "statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
 "statusom\""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Mjenja status jednog ili više računa"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritet"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "prioritet koji želite dodjeliti računu"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4456,7 +4716,7 @@ msgstr ""
 "izmjena prioriteta danog računa. Ako nije određeno, promjena statusa svih "
 "računa koji imaju postavljenu opciju \"sinkronizacija sa globalnim statusom\""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4466,29 +4726,29 @@ msgstr ""
 "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo postavite "
 "'OpenPGP ključ' kao ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontakta koji će primiti poruku"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je označeno, poruka će biti kriptirana koristeći ovaj javni ključ"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je označeno, poruka će biti poslana koristeći ovaj račun"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4498,119 +4758,119 @@ msgstr ""
 "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo postavite "
 "'OpenPGP ključ' kao ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "tema poruke"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku grupnom razgovoru kojem ste pristupili."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID sobe koja će primiti poruku"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID kontakta"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o računu"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Ime računa"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "datoteka"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Putanja datoteke"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ako je označeno, datoteka će biti poslana koriteći ovaj račun"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Prikatuje sve postavke i njihove vrijednosti"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "ključ=vrijednost"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'ključ' je ime postavke, 'vrijednost' je vrijednost na koju će se postaviti"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Briše element postavke"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "ključ"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "ime postavke koja će se brisati"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je označeno, kontak se uzima sa kontakt liste ovog računa"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ukoliko nije određen račun)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ukoliko nije određen račun)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Šalje korisnički XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4619,17 +4879,17 @@ msgstr ""
 "Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
 "na sve račune"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Promjeni status"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Nadimak koji će se koristiti"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4638,19 +4898,19 @@ msgstr ""
 "Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
 "na sve račune"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Provjerite da li je Gajim pokrenut"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4659,15 +4919,15 @@ msgstr ""
 "'%s' nije na vašoj listi.\n"
 "Molim odredite račun za slanje poruke."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim nije pokrenut. Nije moguće koristiti gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4676,16 +4936,16 @@ msgstr ""
 "Uporaba: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4696,7 +4956,7 @@ msgstr ""
 "Uporaba: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4705,7 +4965,7 @@ msgstr ""
 "Previše argumenata. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4879,11 +5139,6 @@ msgstr "Kraj tjedna"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP račun %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4908,52 +5163,52 @@ msgstr "Soba je uništena"
 msgid "You can join this room instead: %s"
 msgstr "Možete se pridružiti ovoj sobi umjesto: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Jedna Poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Privatna Poruka iz privatnog razgovora %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je Promjenio Status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Se Prijavio"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Se Odjavio"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Nije na Listi Kontakata"
 
@@ -5789,22 +6044,18 @@ msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju, ako je to moguće?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Poredani popis (odjeljen razmakom) vrsta povezivanja za probati. Može "
-"sadržavati tls, ssl ili plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5812,49 +6063,49 @@ msgid ""
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije korištenja standardne SSL biblioteke."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Popis ssl grešaka koje će se ignorirati, odjeljene razmakom."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Razmak poslan nakon neaktivnosti"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping poslan nakon neaktivnosti"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5863,11 +6114,11 @@ msgstr ""
 "Koliko sekundi čekati odgovor ping alive paketa prije nego pokušamo ponovno "
 "spajanje."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5875,21 +6126,21 @@ msgstr ""
 "Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran "
 "u file_transfer_proxies opcijama za prijenos."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtjev za potvrdom o primitku"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Šalji potvrde o primitku"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5897,12 +6148,12 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vam želi poslati datoteku."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5910,53 +6161,63 @@ msgstr ""
 "Prilikom pregovaranja o kriptiranoj sesiji, treba li Gajim pretpostaviti da "
 "želite zapisati vaš razgovor?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anonimna autentifikacija"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anon_imna autentifikacija"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anon_imna autentifikacija"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
@@ -5965,7 +6226,7 @@ msgstr ""
 "Koliko linija teksta zatražiti od poslužitelja kod pridruživanja grupnom "
 "razgovoru."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
@@ -5974,90 +6235,90 @@ msgstr ""
 "Koliko minuta prijašnjeg razgovora zatražiti kod pridruživanja grupnom "
 "razgovoru."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite mi poruku."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Radim"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Radim."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Vani"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Vani uživam život."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Ne uznemiravaj."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6066,27 +6327,27 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
 "nadimak."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "zelena"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "namirnice"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "ljudska"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "morska"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Za"
@@ -6165,37 +6426,50 @@ msgstr "Sve nepročitane poruke su proslijeđene."
 msgid "Forward unread message then disconnect"
 msgstr "Proslijedi nepročitane poruke"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Datoteka je prazna"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Datoteka ne postoji"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "kreiram bazu zabilješki"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "kreiram bazu zabilješki"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Poslati %s prema %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je datoteka ali bi trebao biti direktorij"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim će se sad isključiti"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je direktorij ali bi trebao biti datoteka"
@@ -6205,11 +6479,11 @@ msgstr "%s je direktorij ali bi trebao biti datoteka"
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cijan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migriram bazu zabilješki u indekse"
 
@@ -6218,189 +6492,189 @@ msgstr "migriram bazu zabilješki u indekse"
 msgid "%s is not a valid loglevel"
 msgstr "%s nije ispravna razina zapisnika (loglevel)"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Nemoguće dobaviti certifikat izdavača"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Nemoguće dobaviti CRL certifikata"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nemoguće dekriptirati potpis certifikata"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nemoguće dekriptirati CRL potpis"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Nije moguće dekodirati izdavačev javni ključ"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu certifikata"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Greška u CRL potpisu"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Certifikat još nije ispravan"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Certifikat je istekao"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL nije još ispravan"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Format greška u certifikatovom notBefore polju"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Format greška u certifikatovom notAfter polju"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format greška u CRL lastUpdate polju"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format greška u CRL nextUpdate polju"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Nema dovoljno memorije"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Osobno potpisan certifikat u lancu"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Nemoguće dobaviti certifikat lokalnog izdavača"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Nemoguće potvrditi ispravnost prvog certifikata"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Lanac certifikata je pre dugačak"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certifikat je poništen"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Neispravan CA certifikat"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Pređeno ograničenje duljine putanje"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha certifikata"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certifikat nije pouzdan"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certifikat odbijen"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Korištenje ključa ne uključuje potpisivanje certifikata"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Veza sa računom \"%s\" je izgubljena"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Ponovo se spojite ručno."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Poslužitelj %(name)s je krivo odgovorio na zahtjev za registraciju: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Poslužitelj %s je pružio drugačiju formu za registraciju"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nije moguća veza sa \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Nije moguća veza sa \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Odgovor poslužitelja: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Veza na proxy nije uspjela"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Neuspješno povezivanje na račun %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Veza sa računom %s je izgubljena. Pokušajte ponovno spajanje."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Autentičnost certifikata %s bi mogla biti neispravna."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6409,7 +6683,7 @@ msgstr ""
 "\n"
 "SSL Greška: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6418,38 +6692,38 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Autentičnost certifikata %s bi mogla biti neispravna."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nije moguća veza sa \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Molim vas da provjerite korisničko ime i lozinku za greške."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Poslan kontakt: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Poslani kontakti:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
@@ -7320,159 +7594,184 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Neispravan znak u imenu računala."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Potrebna je adresa poslužitelja."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Neispravan znak u korisničkom imenu."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Neispravan znak u resursu."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?status prijenosa:Stanka"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Odspojen"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?kontakt ima status:Nepoznat"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?kontakt ima status:Ima greške"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Pretplata koju već imamo:Ništa"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Za"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Oboje"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Pitaj (za Pretplatu):Ništa"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Sudionici"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Sudionik"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Posjetitelj"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "obraća pažnju na razgovor"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "piše poruku..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "stanka pri pisanju poruke"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7480,22 +7779,22 @@ msgstr[0] "%d poruka na čekanju"
 msgstr[1] "%d poruke na čekanju"
 msgstr[2] "%d poruka na čekanju"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "iz sobe %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "od korisnika %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "od %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7503,74 +7802,74 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaja na čekanju"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Želio bih Vas dodati na moju listu kontakata."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL nije još ispravan"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registracijske informacije za transport %s nisu došle na vrijeme"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "poruka"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Želio bih te dodati na moju listu kontakata."
 
@@ -7608,43 +7907,43 @@ msgstr ""
 "Sesijska sabirnica nije dostupna.\n"
 "Pokušajte pročitati http:/trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalnu uslugu"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemoguće vezanje na port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Molim provjerite da li je avahi-daemon pokrenut."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promjeniti status računa \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Vašu poruku nije moguće poslati."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je odspojen. Vašu poruku nije moguće poslati."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7890,6 +8189,11 @@ msgstr "_Zabrani"
 msgid "_Add to Roster"
 msgstr "_Dodaj na Listu"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Izvrši Naredbu..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8172,11 +8476,11 @@ msgstr "O meni"
 msgid "Con_tinue"
 msgstr "_Nastaviti"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Stanka"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Odustani"
@@ -8185,32 +8489,32 @@ msgstr "_Odustani"
 msgid "_Open Containing Folder"
 msgstr "_Otvaranje Mape Sadržaja"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Prijenosi Datoteka"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "lista prijenosa datoteka"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Lista aktivnih, kompletiranih i zaustavljenih prijenosa datoteka"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Počist_i"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Ukloni završene, zaustavljene ili neuspjele prijenose datoteka sa liste"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Ukloni prijenos datoteka sa liste"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8218,32 +8522,37 @@ msgstr ""
 "Ova akcija uklanja prijenos datoteke sa liste. Ako je prijenos aktivan, prvo "
 "se zaustavlja i onda uklanja"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Prekini transfer odabrane datoteke i izbriši nekompletnu datoteku"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Prekini transfer datoteke"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Prekini transfer odabrane datoteke"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Pošalji i Zatvori"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Skriva prozor"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Obavijesti me kada se završi prijenos datoteka"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Prikaži obavijest kada završi prijenos datoteka"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Prikazuje listu prijenosa datoteka između vas i ostalih"
 
@@ -8252,7 +8561,7 @@ msgid "Register to"
 msgstr "Registriraj na"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Uredu"
 
@@ -8283,21 +8592,21 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Očisti oblikovanje"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Prikaži popis emoticona (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Odabir Datoteke za Slanje..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prikaži popis emoticona (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Događaj"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Događaji"
@@ -8360,7 +8669,7 @@ msgstr "<b>Font</b>"
 msgid "<b>#</b>"
 msgstr "<b>Font</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9120,10 +9429,6 @@ msgstr "_Otvori..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Napredni Uređivač Postavki</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Napredno"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Započni _Razgovor"
@@ -9365,7 +9670,7 @@ msgid "_Open Email Composer"
 msgstr "_Otvori Sastavljanje Emaila"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Započni Razgovor"
 
@@ -9410,6 +9715,10 @@ msgstr "Postavke"
 msgid "Default:"
 msgstr "Predefinirano"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Dodaj Novi Kontakt"
@@ -9435,6 +9744,16 @@ msgstr "_Nadimak:"
 msgid "_Group:"
 msgstr "_Grupa:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID Korisnika:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Nadimak"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9473,6 +9792,11 @@ msgstr ""
 "Morate biti spojeni na transport da bi ste mogli\n"
 "dodavati kontakte sa ovog protokola."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Izmjena Statusne Poruke"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Raspoloženje:</b>"
@@ -9698,10 +10022,9 @@ msgstr "_Izvrši Naredbu..."
 msgid "_Verify"
 msgstr "_Provjeri"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Korisnički Račun"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b> informacije)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9728,11 +10051,6 @@ msgstr "Prikaži Samo _Aktivne Kontakte"
 msgid "Show Transports"
 msgstr "Prikaži _Prijenose"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Prijenosi Datoteka"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9807,49 +10125,34 @@ msgstr "Minimiziraj kod Automatskog Ulaska"
 msgid "Pr_int status:"
 msgstr "Ispis statusa:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Opis"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Prijavi Grešku"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Najvjerojatnije nije kobna, ali ipak preporučamo, da ju javite programerima."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Zahtjev za Pretplatom"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Prijavi Grešku"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Odbij"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Odbija autorizaciju kontaktu kako nebi mogao vidjeti kada ste spojeni"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Akcije"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Odobri"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Dozvoli kontaktu da može vidjeti kada sam spojen"
 
@@ -9867,11 +10170,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Prisutnost"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Pozovi Prijatelje!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9880,15 +10183,20 @@ msgstr ""
 "Započeti će te MUC razgovor.\n"
 "Odaberite kontakte koje želite pozvati"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Molim odaberite MUC poslužitelj."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC poslužitelj"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Po_zovi"
 
@@ -10009,11 +10317,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Čistim"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10175,6 +10478,16 @@ msgstr "Prikaži Sve _Događaje na Čekanju"
 msgid "Mute Sounds"
 msgstr "Onemogući Zvukove"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Postavke"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Izlaz"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Za:"
@@ -10581,14 +10894,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Konfiguracija Sobe"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klijent"
@@ -10713,6 +11018,30 @@ msgid "Plugin manager"
 msgstr "Registracija nije uspijela"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP račun %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Opis"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>netko@negdje.com</b> želi da <b>dodate</b> neke kontakte na vašu listu."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Poredani popis (odjeljen razmakom) vrsta povezivanja za probati. Može "
+#~ "sadržavati tls, ssl ili plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Akcije"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Potreban je python-dbus."
 
@@ -10912,12 +11241,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Uporaba: /%s, sakriva dugmadi."
 
-#~ msgid "File is empty"
-#~ msgstr "Datoteka je prazna"
-
-#~ msgid "File does not exist"
-#~ msgstr "Datoteka ne postoji"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10947,58 +11270,6 @@ msgstr "Registracija nije uspijela"
 #~ msgstr "Potreban je python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?status prijenosa:Stanka"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?status prijenosa:Stanka"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?kontakt ima status:Nepoznat"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?kontakt ima status:Ima greške"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Pretplata koju već imamo:Ništa"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Pitaj (za Pretplatu):Ništa"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?ispis_statusa:Sve"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?ispis_statusa:Ništa"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Dostupan"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "račun"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "poruka"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "prioritet"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "soba"
 
@@ -11010,30 +11281,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "?CLI:password"
 #~ msgstr "lozinka"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Grupni Razgovori"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Skidanje"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Podizanje"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?status prijenosa:Stanka"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Klijent:Nepoznat"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Nepoznat"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Vrijeme:Nepoznato"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Koristi DBus i Notification-Daemon za prikazivanje obavijesti"
 
@@ -11239,9 +11486,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "Choose _Key..."
 #~ msgstr "Odaberi _Ključ"
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Koristi G_PG Agent"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11367,18 +11611,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML Unos</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filter:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML Unos</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Pošalji"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML Konzola za %s"
 
@@ -11779,9 +12011,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Pozovi kontakte na razgovor (Ctrl+G)"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESession</b> informacije)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Ime kontakta"
@@ -11794,12 +12023,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "All Chat Histories"
 #~ msgstr "Svi statusi"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>netko@negdje.com</b> želi da <b>dodate</b> neke kontakte na vašu listu."
-
 #~ msgid "More"
 #~ msgstr "Više"
 
@@ -12720,9 +12943,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
@@ -12775,12 +12995,6 @@ msgstr "Registracija nije uspijela"
 #~ "Način korištenja: /%s <action>, šalje akciju trenutnom grupnom razgovoru. "
 #~ "Koristite treću osobu. (npr. /%s eksplodira.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Enkripcija omogućena"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Enkripcija onemogućena"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
diff --git a/po/hu.po b/po/hu.po
index a2ce198f5..d1080ee08 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2010-11-28 12:15+0100\n"
 "Last-Translator: Gabriel Papp <gabriel.papp@gmx.com>\n"
 "Language-Team: -\n"
@@ -25,20 +25,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Hiba."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Biztosan elküldöd a file-t?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -95,70 +95,70 @@ msgstr "Idő"
 msgid "Progress"
 msgstr "Állapot"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Filenév: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Méret: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Te üzeneted"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Feladó: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Címzett: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Elmentve ebbe: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Fileátvitel sikeres"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Open Containing Folder"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Fileátvitel megszakítva"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Nem létesíthető kapcsolat a partnerrel."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Címzett: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Hibaüzenet: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Fileátvitel megállítva"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -166,34 +166,34 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Válaszd ki az elküldendő filet..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Küld"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Leírás: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "A Gajim nem fér hozzá ehhez a filehoz"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nem lehet kicserélni a létező filet \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -201,93 +201,93 @@ msgstr ""
 "Egy file már létezik ezzel a névvel és neked nincs jogosultságod ahhoz, hogy "
 "felülírd."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Ez a file már létezik"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Mit szeretnél csinálni?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "A(z) \"%s\" könyvtár nem írható"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Nincs jogosultságod file létrehozására ebbe a könyvtárba"
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "File mentése másként..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Típus: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Leírás: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s egy filet szeretne küldeni neked:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Profil küldése..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Fileátvitel hiba"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, fuzzy, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, fuzzy, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Érvénytelen file"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "File: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Nem lehet üres fileokat küldeni"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Név: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Feladó: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Szünet"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 #, fuzzy
 msgid "_Continue"
 msgstr "_Continue"
@@ -454,43 +454,63 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "python-gnome2 szükséges hozzá."
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "Elérhető"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Funkció"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Hiba a file olvasása közben:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Hiba a file értelmezése közben:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Kiterjesztés nem támogatott"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, fuzzy, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Kép mentése másként..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Van "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Ismeretlen"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Ismeretlen"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "Ismeretlen"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "<b>Szerep:</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Hovatartozás:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -499,7 +519,7 @@ msgstr ""
 "Ezt a partnert érdekli, hogy mikor szoktál jelen lenni, de téged nem érdekel "
 "hogy ő mikor szokott"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -508,13 +528,13 @@ msgstr ""
 "Érdekel, hogy a partner mikor szokott jelen lenni, de őt nem érdekli hogy te "
 "mikor szoktál"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Téged és a partneredet is érdekli hogy mikor szokott a másik jelen lenni"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -522,27 +542,37 @@ msgid ""
 msgstr ""
 "Téged és a partneredet is érdekli hogy mikor szokott a másik jelen lenni"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "A partnernek küldött felirakozási kérelmed válaszára vársz"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Nincs függő feliratkozási kérelem."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " erőforrás prioritással "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Minden file"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Takarít"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Manage Proxy Profiles"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -585,13 +615,13 @@ msgid "_New Group Chat"
 msgstr "Ú_j közös társalgás"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Nincs a névsorban"
 
@@ -604,7 +634,7 @@ msgstr "Hozzá szeretnélek adni a névsoromhoz"
 msgid "Send Single _Message…"
 msgstr "_Levél küldése"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "E_gyedi Állapot Beállítása"
@@ -622,25 +652,25 @@ msgstr "Transzport _kezelése"
 msgid "_Modify Transport"
 msgstr "Transzport _módosítása"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "Át_nevez"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "Tiltás _Feloldása"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Tiltás"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Eltá_volít"
@@ -654,205 +684,225 @@ msgstr "_Információ"
 msgid "Send File..."
 msgstr "_File Küldése..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "_Partnerek Meghívása "
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Hozzáadás a Főablakhoz"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "Hang teszt"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "Videó teszt"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Információ"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Előzmények"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Szoba _Kezelése"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "_Beszélgetőtéma megváltoztatása..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "_Szoba Beállítása..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Szoba _törlése"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Becenév _megváltoztatása..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Szoba felvétele a _könyvjelzők közé"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Hang"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Sablonüzenetek:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Tálcára helyezés bezáráskor"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "Parancs _futtatása"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Lecsatlakozás"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Csatlakozás Csoportos Beszélgetéshez"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Ismerős hozzáadása..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "file"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Szolgáltatások felderítése"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "_Levél küldése..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Haladó"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Tulajdonságok"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Szinkronizálás"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Magánéleti listák"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Szerver"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML parancssor"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Admin"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Szerverüzenet küldése..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "MOTD Beállítása..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "MOTD Frissítése..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "MOTD Törlése"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "No account available"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Fiókok"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "üzenet"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Hangulatjelek:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Nem található az előzménynapló adatbázisa"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "Jabber Azonosító"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Dátum"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Becenév"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Üzenet"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Tárgy"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -860,7 +910,7 @@ msgstr ""
 "Biztosan ki szeretnéd takarítani az adatbázist? (ERŐSEN NEM AJÁNLOTT, HA FUT "
 "A GAJIM)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -875,97 +925,97 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Adatbázis hiba"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Előzménynaplók exportálása..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, fuzzy, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Biztosan szeretnéd törölni a kiválasztott üzenetet?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Biztosan szeretnéd törölni a kiválasztott partner naplóit?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "A szolgáltatás nem található"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Megerősítés megszakítása"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Biztosan szeretnéd törölni a kiválasztott üzenetet?"
 msgstr[1] "Biztosan szeretnéd törölni a kiválasztott üzeneteket?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Ez egy visszafordíthatatlan művelet"
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Profil lekérése..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Nem lehet a képet betölteni"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "Rossz dátumformátum"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "A dátumformátumnak ilyennek kell lenni: ÉÉÉÉ-HH-NN (Év-Hó-Nap)"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Információ érkezett"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Nem csatlakozol a szerverhez"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Kapcsolat nélkül nem tudod közzétenni a partnerinformációd"
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Profil küldése..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Az információ NEM LETT közzétéve"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard közzététel nem sikerült"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -983,10 +1033,10 @@ msgstr "Partner neve: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber Azonosító: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Általános"
@@ -1075,36 +1125,36 @@ msgid "Please fill in the data of the contact you want to add"
 msgstr ""
 "Kérlek töltsd ki annak a partnernek az adatait akit hozzá szeretnél adni"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Érvénytelen felhasználói azonosító"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "A felhasználói azonosító nem tartalmazhat erőforrást"
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Nem veheted fel saját magad a névsorra."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "A partner már a névsoron van"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Ez a partner már fel van véve a névsorba."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Felhasználói azonosító:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Hiba a szolgáltatás hozzáadása közben. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1112,61 +1162,63 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Egy GTK+ Jabber kliens"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ Verzió:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK Verzió:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Jelenlegi fejlesztők:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Fejlesztők voltak:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Végül de nem utolsó sorban köszönetet szeretnénk mondani az összes csomag "
 "karbantartónak."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
-msgstr "Gabriel Papp <gabriel.papp@gmx.com>"
+msgstr ""
+"Gabriel Papp <gabriel.papp@gmx.com>\n"
+"Göller Bertalan <>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Nem érhető el szótár a(z) %s nyelvhez"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1180,12 +1232,12 @@ msgstr ""
 "\n"
 "A félregépelt szövegek kiemelése funkció nem lesz használva"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Nem biztonságos kapcsolat"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1197,281 +1249,305 @@ msgstr ""
 "azt jelenti, hogy az összes beszélgetésed titkosítatlanul fog továbbítódni. "
 "Biztosan ezt szeretnéd tenni?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Igen, ennek ellenére szeretnék csatlakozni"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "_Ne kérdezzen meg újra"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Érvénytelen becenév"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "A becenévben nem megengedett karakterek vannak."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Feliratkozási kérelem"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr ""
 "Feliratkozási kérelem ehhez a fiókhoz: %(account)s, e(zek)től a "
 "felhasználó(k)tól %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Feliratkozási kérelem tőle: %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Csatlakozás Csoportos Beszélgetéshez"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Érvénytelen szoba"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Érvénytelen becenév"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Kérlek készíts egy tiszta új témát a kívánt névvel."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Érvénytelen Jabber Azonosító"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Addig nem léphetsz be közös társalgásba amíg csatlakozva vagy."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Rossz URI"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Ez nem egy közös társalgás"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Kapcsolat nélkül nem szinkronizálhatod a partnereid."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Név"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Szerver"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Ez a fiók nem kapcsolódik a szerverhez"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Addig nem szinkronizálhatod a fiókkal amíg csatlakozva van."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Szinkronizálás"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Folytatott beszélgetés"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Új közös beszélgetés"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Új partner felvétele"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Kapcsolat nélkül nem változtathatod meg a jelszavad."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Érvénytelen jelszó"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Be kell írnod egy jelszót."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "A beírt jelszavak nem egyeznek"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "A jelszavaknak egyezniük kell egymással mindkét mezőben."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Partner bejelentkezett"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Partner kijelentkezett"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Új üzenet"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Új levél"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Új privát üzenet"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Új E-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Fileátviteli kérelem"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Fileátvitel hiba"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Fileátvitel befejezve"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Fileátvitel megállítva"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Meghívó közös társalgásba"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "A partner megváltoztatta az állapotát"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Levél ezzel a fiókkal: %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Levél ebben a fiókban %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Levél"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Elküldött %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Fogadott %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Feladó %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Kapcsolat nem elérhető"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Győződj meg róla, hogy ezzel vagy csatlakozva: \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 "Nem lehetséges az üzenetküldés neki: %s. Ez a Jabber Azonosító nem érvényes."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s írta:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Takarít"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Szűrés:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML bemenet</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Küld"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "hozzáad"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "módosít"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "eltávolít"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1479,202 +1555,201 @@ msgid ""
 msgstr ""
 "<b>%(jid)s</b> szeretne <b>%(action)s</b> néhány partnerhez a névsoron."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Hozzáad"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Módosít"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Törlés"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Csoportok"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s javasolta nekem hogy vegyelek fel a névsoromba."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "%d partner hozzáadva"
 msgstr[1] "%d partner hozzáadva"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "%d partner eltávolítva"
 msgstr[1] "%d partner eltávolítva"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Your Archiving Preferences have been saved!"
 msgstr ""
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
-#, fuzzy
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
-msgstr "A szolgáltatás hibát jelzett."
+msgstr "A szolgáltatás hibát jelzett: {}"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Hiba"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber Azonosító"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Magánéleti lista <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Magánéleti lista ehhez: %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Magánéleti lista"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Sorrend: %(order)s, művelet: %(action)s, típus: %(type)s, érték: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sorrend: %(order)s, művelet: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Szabály szerkesztése</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Szabály hozzáadása</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Magánéleti listák ehhez: %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Érvénytelen listanév"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Be kell írnod egy nevet hogy magánéleti listát készíthess."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Meghívtak közös társalgásba"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Partner meghívott téged hogy csatlakozz egy beszélgetéshez"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Partner meghívott téged egy közös társalgásba %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Megjegyzés: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "El szeretnéd fogadni a meghívást?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "Válassz kliens tanusítványt #PCKS12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "PKCS12 Fileok"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Válassz hangot"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav hangok"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Válassz képet"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Képek"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Válassz képet"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Minden file"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Amint %s válik:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Egyedi figylemeztetés hozzáadása hozzá: %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "egy hang és videó"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "egy hang"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "egy videó"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, fuzzy, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -1683,12 +1758,12 @@ msgstr ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "for account %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1712,68 +1787,96 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL tanusítvány hiba"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Fileátvitelek"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E titkosítás kikapcsolva"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s mostantól így szerepel: %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s mostantól %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Nem sikerült elküldeni a privát üzenetet"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Metacontacts storage not supported by your server"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Téma váltása"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Kérlek add meg az új témát:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Becenév megváltoztatása"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Kérlek határozd meg az új becenevet amelyet használni szerenél:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Érvénytelen közös társalgási Jabber Azonosító"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr ""
 "A közös társalgás Jabber Azonosítójában nem megengedett karakterek vannak."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "%s törlése"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1782,256 +1885,266 @@ msgstr ""
 "Véglegesen törölni szeretnéd ezt a szobát.\n"
 "Ha szeretnél, beírhatsz egy indokot:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Ha szeretnél, beírhatsz egy alternatív értéket:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Írd be a becenevet"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "és hitelesített"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "és NEM hitelesített"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)ok titkosítás %(status)ok aktív %(authenticated)s.\n"
 "A beszélgetési munkamenet %(logged)k naplózot(ak)."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Beszélgetés vele: "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Folytatott beszélgetés"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s has set the subject to %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 #, fuzzy
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "A szoba mostantól mutatja a nem elérhető tagokat"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "a szoba mostantól nem mutatja a nem elérhető tagokat"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "A szoba naplózása mostantól engedélyezve van"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "A szoba naplózása mostantól nincs engedélyezve"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 #, fuzzy
 msgid "Room is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 #, fuzzy
 msgid "Room is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "A szoba mostantól teljesen anonymous"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s el lettek távolítva a szobából (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Szoba naplózása engedélyezve"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Egy új szoba lett létrehozva"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 "A szerver hozzárendelte vagy módosította a te beceneved ebben a szobában"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, fuzzy, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, fuzzy, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, fuzzy, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Mostantól így szerepelsz: %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s el lettek távolítva a szobából (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "a hovatartozás megváltozott"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 #, fuzzy
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "a rendszer leáll"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, fuzzy, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, fuzzy, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Affiliation of %(nick)s has been set to %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Role of %(nick)s has been set to %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s távozott"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s csatlakozott a közös beszélgetéshez"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Biztosan el szeretnéd hagyni ezt a közös beszélgetést: \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ha bezárod ezt az ablakot akkor kilépsz ebből a közös beszélgetésből."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "%s kirúgása"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Ha szeretnél, beírhatsz egy indokot:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "%s bannolása"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Fileátvitelek"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Fileküldés Befejezve"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr ""
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ez a partner nem támogatja a fileátvitelt."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, fuzzy, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)ok állapot : %(state)ok, indok: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)ek a csoportos beszélgetésből %(room_name)ek"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Munkamenet létrehozása megszakítva"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "A munkamenet NEM LESZ naplózva"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Ez a munkamenet titkosított"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " és NAPLÓZVA LESZ"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " és NEM LESZ naplózva"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2039,16 +2152,16 @@ msgstr ""
 "A beszélgetőpartner személyazonossága nem visszaigazolt. Kattints a pajzs "
 "gombra a részletekért."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E titkosítás kikapcsolva"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Új üzeneted érkezett tőle: \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2056,7 +2169,7 @@ msgstr ""
 "Ha bezárod ezt a fület és a beszélgetésnaplózás funkció ki van kapcsolva, "
 "akkor ez az üzenet el fog veszni."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2065,7 +2178,7 @@ msgstr ""
 "Tárgy: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2074,96 +2187,96 @@ msgstr ""
 "Nem lehet tőle visszafejteni az üzenetet: %s\n"
 "Elképzelhető, hogy szabotázs történt."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s mostantól %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Fileátvitelek"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Méret: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "_Fiókok"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Csatlakozás"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "A partner megállította a fileátvitelt"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Hiba a file megnyitása közben"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Összevont fiókok"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Csoportos beszélgetések"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transzportok"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Engedély elküldve"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Now \"%s\" will know your status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Feliratkozási kérelem elküldve"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Engedély eltávolítva"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "A GPG nem használható"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2171,11 +2284,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Egy vagy több közös beszélgetésben veszel részt"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 #, fuzzy
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
@@ -2184,32 +2297,31 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: gajim/roster_window.py:2334
-#, fuzzy
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
-msgstr "desync'ed"
+msgstr "szétkapcsolt"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 #, fuzzy
 msgid "Really quit Gajim?"
 msgstr "Really quit Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 #, fuzzy
 msgid "Always close Gajim"
 msgstr "Always close Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "You have running file transfers"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 #, fuzzy
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
@@ -2218,12 +2330,12 @@ msgstr ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 #, fuzzy
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -2232,17 +2344,17 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, fuzzy, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -2251,12 +2363,12 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2265,12 +2377,12 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "You are about to block a contact. Are you sure you want to continue?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2279,62 +2391,62 @@ msgstr ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 #, fuzzy
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 #, fuzzy
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, fuzzy, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Also remove all contacts in this group from your roster"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 #, fuzzy
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, fuzzy, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, fuzzy, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2343,12 +2455,12 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2357,17 +2469,17 @@ msgstr ""
 "By removing this contact you also by default remove authorisation resulting "
 "in him or her always seeing you as offline."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 #, fuzzy
 msgid "I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2376,14 +2488,14 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2392,27 +2504,27 @@ msgstr ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 #, fuzzy
 msgid "No account available"
 msgstr "No account available"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 #, fuzzy
 msgid "You must create an account before you can chat with other contacts."
 msgstr "You must create an account before you can chat with other contacts."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Amíg láthatatlan vagy nem csatlakozhatsz közös beszélgetéshez"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 #, fuzzy
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2421,14 +2533,14 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2438,193 +2550,193 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Érvénytelen file URI:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Szeretnéd ezt a fájlt elküldeni neki(k)? %s:"
 msgstr[1] "Szeretnéd ezeket a fájlokat elküldeni neki(k)? %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s to %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Make %s and %s metacontacts"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "Állapot üzenet _megváltoztatása"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Éppen hallgatott zeneszám címének közzététele"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "Tartózkodási hely közzététele"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Szolgáltatások beállítása..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "Mindet _teljes képernyőre"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Közös _beszélgetési üzenet küldése"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Az összes felhasználónak"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Az összes jelenlévő felhasználónak"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Meg_hívás ide:"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "Partnerek _kezelése"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "_Csoportok szerkesztése"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Teljes képernyő"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "Újracsatlakozás"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Lecsatlakozás"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Előzmények"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Előzménykezelő"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Csatlakozás új közös beszélgetéshez"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "Állapot üzenet _megváltoztatása"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Csak a főablakban jelenítse meg"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Bővített Konfiguráció Szerkesztő"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s konfiguráció hiba"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Összes függő esemény mutatása"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Adatbázis hiba"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Mit szeretnél csinálni?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Csatlakozás"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Olvasatlan üzenetek továbbítása"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2633,7 +2745,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2641,7 +2753,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2788,16 +2900,16 @@ msgstr ""
 "Ahhoz hogy töröld a regisztrációd egy szerverről, a fiókodnak engedélyezve "
 "kell lenni."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Jelszó szükséges"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Írd be a jelszavad a következő fiókhoz: %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Jelszó megjegyzése"
 
@@ -2827,10 +2939,18 @@ msgstr "Eltávolítás csak a Gajim-ból"
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ne távolíts el semmit. Később újból megpróbálom"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "Minden"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Csak belépés és elhagyás"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "Egyik sem"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Új közös beszélgetés"
@@ -2897,11 +3017,11 @@ msgstr "Érvénytelen bejegyzés"
 msgid "Custom port must be a port number."
 msgstr "Az egyedi portnak egy számnak kell lennie."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Tanusítvány már a fileban van"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Ez a tanusítvány már a %s fileban van, ezért nem lett ismét hozzáadva."
@@ -3005,90 +3125,112 @@ msgstr "Közös beszélgetés üzenet kiemelése"
 msgid "Group Chat Message Received"
 msgstr "Közös beszélgetési üzenet érkezett"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, fuzzy, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "Nincs"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Tag"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Tulajdonos"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [tiltva]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [tálcára helyezve]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Csatlakozva"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Lecsatlakozva"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Letöltés"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Feltöltés"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Típus: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Továbbítva: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Nincs elkezdve"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Megállítva"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Befejezve"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Szüneteltetve"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Várakozás"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Továbbítás"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Állapot: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "Elérhető"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Ráér beszélgetni"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Távol"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Nem elérhető"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Kijelentkezett"
 
@@ -3137,122 +3279,126 @@ msgstr "(Nincs)"
 msgid "Hidden"
 msgstr "Rejtett"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Beszélgetésnapló vele: %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Beszélgetés Előzmények"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Lemezhiba"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Hiba: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Hiba"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Az állapot mostantól: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Az állapot mostantól: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tárgy: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Állapot üzenet _megváltoztatása"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "%s fiók használatával"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Könyvjelzők kezelése"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "Névsor el_rejtése"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Névsor mutatása"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Elrejti ezt a menüt"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "Nem lehet betölteni a képet"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Média típus nem támogatott: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "uj@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "uj%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Hostnév:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Szerver válaszolt: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3412,7 +3558,7 @@ msgstr "_Feliratkozás"
 msgid "_Unsubscribe"
 msgstr "_Leiratkozás"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -3421,51 +3567,57 @@ msgstr ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Idézet"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Műveletek ehhez: \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia cikk elolvasása"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Megnézem a _szótárban"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, fuzzy, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, fuzzy, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Rá_keresés a weben"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Megnyit egy _linket"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Érvénytelen Jabber Azonosító"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3477,30 +3629,35 @@ msgstr[1] "%i nappal ezelőtt"
 msgid "Write a message.."
 msgstr "Egy Üzenet Fogadása"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Több lap bezárása előtt állsz"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Biztosan mindet be szeretnéd zárni?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Közös beszélgetések"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Privát beszélgetések"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Üzenetek"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3512,109 +3669,109 @@ msgstr ""
 "occupant.\n"
 "Please specify another nickname below:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 #, fuzzy
 msgid "Always use this nickname when there is a conflict"
 msgstr "Always use this nickname when there is a conflict"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Elfogadod ezt a felkérést?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request on account %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Kapcsolat megszakadt"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "A Password is required to join the room %s. Please type it."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Betűtípus</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Bannolva lettél a közös beszélgetésekből %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Group chat %s does not exist."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Group chat %s does not exist."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Közös beszélgetés létrehozása korlátozva van."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Nem sikerült csatlakozni közös beszélgetéshez"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "A regisztrált becenevedet kell használnod a közös beszélgetésben %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nem vagy ennek a közös beszélgetésnek a taglistáján %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "hiba ennek a küldése során %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Feliratkozási kérelem"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Megfigyelők"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Engedély elfogadva"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, fuzzy, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3623,31 +3780,31 @@ msgstr ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Leiratkozva"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, fuzzy, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Ellenőrizd a kapcsolatod és később próbáld meg újra."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3656,36 +3813,36 @@ msgstr ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jelenleg az OpenPGP kulcsod nélkül csatlakozol"
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Rossz jelszó"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Rossz jelszó"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "A tanusítvány lejárt"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Válaszd ki az OpenPGP kulcsod"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3694,77 +3851,82 @@ msgstr ""
 "A GPG kulcs amivel ez a beszélgetés lesz titkosítva nem megbízható. Biztosan "
 "szeretnéd titkosítani az üzenetet?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s egy filet szeretne küldeni neked."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL tanusítvány hiba"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Fileküldés Befejezve"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, fuzzy, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Válaszd ki az elküldendő filet..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Nem lehet visszafejteni az üzenetet"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "felhasználónév összeférhetetlenség"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Kérlek írj be egy új felhasználónevet a helyi fiókodhoz"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Erőforrás összeférhetetlenség"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3772,20 +3934,20 @@ msgstr ""
 "Már csatlakozva vagy ehhez a fiókhoz ugyanazzal az erőforrással. Kérlek írj "
 "be egy másikat"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s szeretne élőszóban beszélni veled."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Élőszavas beszélgetés kérelem"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Hiba az SSL tanusítvány ellenőrzése közben"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3796,7 +3958,7 @@ msgstr ""
 "%(error)s\n"
 "Do you still want to connect to this server?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3809,15 +3971,15 @@ msgstr ""
 "A tanusítvány SHA1 ujjlenyomata:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Mellőzd ezt a hibát ehhez a tanusítványhoz."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3838,7 +4000,7 @@ msgstr ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3847,7 +4009,7 @@ msgstr ""
 "állsz. Hogy ezt megakadályozd, feltelepítheted a PyOpenSSL-t. Biztosan "
 "szeretnéd folytatni ennek ellenére?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3855,16 +4017,16 @@ msgstr ""
 "A jelszavad nem biztonságos kapcsolaton keresztül történő titkosítatlan "
 "továbbítása előtt állsz. Biztosan szeretnéd folytatni?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Ez nem egy közös társalgás"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Hangulatjelek letiltva"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3872,7 +4034,7 @@ msgstr ""
 "A beállított hangulatjel témád nem található, ezért a hangulatjelek le "
 "lesznek tiltva."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3881,11 +4043,11 @@ msgstr ""
 "A beállított hangulatjel témád nem található, ezért a hangulatjelek le "
 "lesznek tiltva."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Ez nem egy közös társalgás"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3893,42 +4055,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Nem lehet elmenteni a beállításaid."
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "alapértelmezett"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 #, fuzzy
 msgid "Passphrase Required"
 msgstr "Jelszó szükséges (vagy jelmondat?)"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG kulcs lejárt"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "A GPG kulcsod lejárt, csatlakoztatva leszel ide: %s Open PGP nélkül."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Rossz jelszó"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Kérlek írd be újra a GPG jelszavad, vagy kattints a mégsére"
@@ -4002,6 +4164,11 @@ msgstr "- üzenetek naplózva lesznek"
 msgid "- messages will not be logged"
 msgstr "- üzenetek nem lesznek naplózva"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4033,7 +4200,7 @@ msgstr "Érvénytelen szoba"
 msgid "The form is not filled correctly."
 msgstr "A becenévben nem megengedett karakterek vannak."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Láthatatlan"
 
@@ -4170,6 +4337,56 @@ msgstr ""
 "%s\n"
 "Link-helyi üzenetküldés valószínűleg nem jól működik."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Nem lehet elindítani a helyi szolgáltatást"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nem lehet a képet betölteni"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "A szolgáltatás hibát jelzett."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Nem lehet a képet betölteni"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Egy kapcsolat nem elérhető"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Téma"
@@ -4195,7 +4412,17 @@ msgstr "Nem törölheted a jelenlegi témád"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Összevont fiókok"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "G_PG kezelő használata"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Nemsokára vagyok."
 
@@ -4220,6 +4447,11 @@ msgstr ""
 "Minden beszélgető és közös beszélgetőablak be lesz zárva. Szeretnéd "
 "folytatni?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Eltávolítás"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4415,52 +4647,66 @@ msgstr "Jelszó megváltoztatása"
 msgid "Login Options"
 msgstr "_Hangulatjelek:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "A D-Bus nincs jelen ezen a számítógépen, vagy a python modul hiányzik"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Mutassa a súgót az egyes parancsoknál"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "parancs"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "mutass súgót az egyes parancsoknál"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Megjeleníti vagy elrejti a névsor ablakot"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Megnyit egy ablakot a következő függő eseménnyel"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Kiír egy listát az összes névsoron lévő partnerről. Minden partner külön "
 "sorba kerül"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "fiók"
+
+#: gajim/gajim_remote.py:99
 #, fuzzy
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Kiír egy listát a regisztrált fiókokról"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Megváltoztatja az állapotát egy fióknak vagy több fióknak"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "állapot"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4469,11 +4715,17 @@ msgstr ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "üzenet"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "állapotüzenet"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
@@ -4482,16 +4734,21 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Egy vagy több fiók prioritását változtatja meg"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritás"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "a prioritás amit hozzá szeretnél rendelni egy fiókhoz"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4500,7 +4757,7 @@ msgstr ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4511,29 +4768,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "Annak a partnernek a Jabber Azonosítója aki az üzenetet kapni fogja"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "üzenet tartalma"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ha be van állítva, az üzenet ezzel a publikus kulccsal lesz titkosítva"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ha be van állítva, az üzenet ezzel a fiókkal lesz elküldve"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4543,123 +4800,123 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "tárgy"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "üzenet tárgya"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Új üzenetet küld egy olyan közös beszélgetésbe amelyhez csatlakoztál."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "A Jabber Azonosítója annak a szobának ami meg fogja kapni az üzenetet"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Részletes információkat kér le a partnerről"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "Partner Jabber Azonosítója"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Részletes információkat kér le a fiókról"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Fiók neve"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Filet küld egy partnernek"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "file"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "File elérési útvonala"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ha be van állítva, a file ezen a fiókon keresztül lesz elküldve"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Kilistáz minden beállítást és azok értékeit"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 #, fuzzy
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "kulcs=érték"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Töröl egy beállítási elemet"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "kulcs"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "a beállítás neve ami törlődni fog"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Kiírja a Gajim beállításainak jelenlegi állapotát egy .config fileba"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Eltávolítja a partnert a névsorról"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 #, fuzzy
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "A jelenlegi állapotot adja vissza (a globálisat, ha nincs fiók beállítva)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Visszaadja az olvasatlan üzenetek számát"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Egyedi XML-t küld"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "küldendő XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4668,15 +4925,15 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Avatar megváltoztatása"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Használni kívánt kép"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4685,19 +4942,19 @@ msgstr ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Ellenőrizd, hogy fut-e a Gajim"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Elrejti vagy megjeleníti az ipython ablakot"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Hiányzó argumentum \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, fuzzy, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4706,15 +4963,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Nincs aktív fiókod"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Úgy tűnik nem fut a Gajim, tehát nem használhatod a gajim-remote-t"
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, fuzzy, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4723,16 +4980,16 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumentumok:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s nincs meg"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4743,7 +5000,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4752,7 +5009,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4926,11 +5183,6 @@ msgstr "A hét vége"
 msgid "Weekend!"
 msgstr "Hétvége!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP fiók %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, fuzzy, python-format
 msgid ""
@@ -4954,52 +5206,52 @@ msgstr "Szoba törölve"
 msgid "You can join this room instead: %s"
 msgstr "Helyette csatlakozhatsz ehhez a szobához: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ismeretlen SSL hiba: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Új levél tőle: %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Új privát üzenet ebből a közös beszélgetésből: %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, fuzzy, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Üzenetet írta: %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Új üzenet tőle: %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s megváltoztatta állapotát"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s bejelentkezett"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s kijelentkezett"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Nincs a névsoron"
 
@@ -5891,23 +6143,18 @@ msgstr "Enable ESessions encryption for this account."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Should Gajim automatically start an encrypted session when possible?"
 
-#: gajim/common/config.py:343
-#, fuzzy
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5915,12 +6162,12 @@ msgid ""
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 #, fuzzy
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -5928,40 +6175,40 @@ msgstr ""
 "Show a warning dialogue before sending PLAIN password over a plain "
 "conenction."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 #, fuzzy
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Space separated list of SSL errors to ignore."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Whitespace sent after inactivity"
 msgstr "Whitespace sent after inactivity"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 #, fuzzy
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sent after inactivity"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5970,12 +6217,12 @@ msgstr ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 #, fuzzy
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 #, fuzzy
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
@@ -5984,23 +6231,23 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 #, fuzzy
 msgid "Answer to receipt requests"
 msgstr "Answer to receipt requests"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 #, fuzzy
 msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -6008,12 +6255,12 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s egy filet szeretne küldeni neked."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 #, fuzzy
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
@@ -6022,151 +6269,161 @@ msgstr ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Message that is sent to contacts you want to add"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anonymous hitelesítés"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anon_ymous hitelesítés"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anon_ymous hitelesítés"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 #, fuzzy
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr "How many lines to request to server when entering a groupchat."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr "How many minutes back to request logs when a entering a groupchat."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Alszik"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Nemsokára vagyok"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Néhány perc múlva vagyok."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Eszik"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Eszek, hagyj üzenetet."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Filmet nézek."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Munka"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Dolgozom."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Telefonálok."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Szabadban"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Kint vagyok a szabadban, élvezem az életet."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Elérhető vagyok."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Ráérek beszélgetni."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Nem vagyok elérhető."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Ne zavarjanak."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Bye!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -6175,28 +6432,28 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 #, fuzzy
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "zöld"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "fűszeres"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "emberi"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "tengerész"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "neki"
@@ -6274,36 +6531,49 @@ msgstr "Az összes olvasatlan üzenet továbbítva lett."
 msgid "Forward unread message then disconnect"
 msgstr "Továbbítsd az olvasatlan üzeneteket, majd kapcsolódj le"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "A file üres"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "A file nem létezik"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "beszélgetésnapló adatbázis létrehozása"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "gyorsítótár adatbázis létrehozása"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Send %s to %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s egy file de lehetne egy könyvtár is"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim most kilép"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s egy könyvtár de lehetne egy file is"
@@ -6313,11 +6583,11 @@ msgstr "%s egy könyvtár de lehetne egy file is"
 msgid "Error: cannot open %s for reading"
 msgstr "Hiba: nem lehet %s-t megnyitni olvasásra"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cián"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -6326,199 +6596,199 @@ msgstr "migrating logs database to indices"
 msgid "%s is not a valid loglevel"
 msgstr "%s érvénytelen naplózási szint"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 #, fuzzy
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 #, fuzzy
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 #, fuzzy
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 #, fuzzy
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Nem lehet dekódolni a kibocsátó publikus kulcsát"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Tanusítvány aláírás hiba"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "CRL aláírás hiba"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Az tanusítvány még nem érvényes"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "A tanusítvány lejárt"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL még nem érvényes"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL lejárt"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 #, fuzzy
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 #, fuzzy
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 #, fuzzy
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 #, fuzzy
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Elfogyott a memória"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Saját magunk által aláírt tanusítvány"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Saját magunk által aláírt tanusítvány a tanusítványláncon"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Nem lehet lekérni a helyi kibocsátó tanusítványát"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Nem lehet ellenőrizni az első tanusítványt"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "A tanusítványlánc túl hosszú"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Tanusítvány érvénytelenítve"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Érvénytelen CA tanusítvány"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Az elérési útvonal elérte a megengedett maximális hosszát"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Nem támogatott tanusítvány cél"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "A tanusítvány nem megbízható"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Tanusítvány visszautasítva"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Téma kibocsátó eltérés"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 #, fuzzy
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 #, fuzzy
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "A kulcshasználat nem tartalmazza a tanusítvány aláírást"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Alkalmazás ellenőrzési funkció"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "A kapcsolat a következő fiókkal megszakadt: \"%s\""
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Manuális újracsatlakozás."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Szerver %(name)s answered wrongly to register request: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, fuzzy, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nem lehet csatlakozni ide: \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Nem lehet csatlakozni ide: \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Szerver válaszolt: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Nem sikerült a csatlakozás a proxyhoz"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nem lehet csatlakozni a fiókhoz %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "A kapcsolat megszakadt a következő fiókkal: %s. Próbálj meg újracsatlakozni."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6527,7 +6797,7 @@ msgstr ""
 "\n"
 "SSL hiba: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6536,38 +6806,38 @@ msgstr ""
 "\n"
 "Ismeretlen SSL hiba: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nem lehet csatlakozni ide: \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Nem sikerült a hitelesítés vele \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Kérlek ellenőrizd a felhasználóneved és jelszavad helyességét."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Elküldött partner: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Elküldött partnerek:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Nem lett lekérve mert az állapot láthatatlan"
 
@@ -7446,255 +7716,279 @@ msgstr "videó bemenet"
 msgid "video output"
 msgstr "videó kimenet"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Nem megfelelő karakter van a hosztnévben."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Szerver cím szükséges."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Nem megfelelő karakter van a felhasználónévben."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Nem megfelelő karakter van az erőforrásban."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "El_foglalt"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Nem elérhető"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Ráér beszélgetni"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "_Elérhető"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Csatlakozás"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Távol"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Kijelentkezett"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Láthatatlan"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Ismeretlen"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Hibái vannak"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Nincs"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "neki"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Feladó"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "mindkét"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Egyik sem"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Feliratkozás"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Nincs"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderátorok"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Résztvevők"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Résztvevő"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Látogatók"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Látogató"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "figyeli a beszélgetést"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "valami mást csinál"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "üzenetet fogalmaz..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "üzenetet fogalmaz, de nem gépel"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "bezárta a beszélgetőablakot, vagy fület"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d függő üzenet"
 msgstr[1] "%d függő üzenetek"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " szobából %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " felhasználótól %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " tól/től %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d függő esemény"
 msgstr[1] "%d függő események"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Fel szeretnélek venni a partnerlistámra."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "Szia! Én $name vagyok."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Időtúllépés a kép betöltése közben"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Túl nagy a kép"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL még nem érvényes"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Időtúllépés a kép betöltése közben"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "üzenet"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Fel szeretnélek venni a névsoromba."
 
@@ -7732,43 +8026,43 @@ msgstr ""
 "Rendszerbusz nem elérhető.\n"
 "Megpróbálom olvasni a(z) %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kélek ellenőrizd hogy az Avahi, vagy a Bonjour telepítve van-e."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Nem lehet elindítani a helyi szolgáltatást"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nem lehet a porthoz kötni %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Kérlek ellenőrizd hogy az avahi-daemon fut-e."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nem lehet megváltoztatni ennek a fióknak az állapotát \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Nem lehet elküldeni az üzeneted."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "A partner nincs bejelentkezve. Az üzeneted nem lett elküldve."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -8013,6 +8307,11 @@ msgstr "_Ban"
 msgid "_Add to Roster"
 msgstr "_Hozzáadás a Főablakhoz"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "Parancs _futtatása"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8294,11 +8593,11 @@ msgstr "Magamról"
 msgid "Con_tinue"
 msgstr "_Continue"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Szünet"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Mégse"
@@ -8308,32 +8607,32 @@ msgstr "_Mégse"
 msgid "_Open Containing Folder"
 msgstr "_Open Containing Folder"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Fileátvitelek"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "fileátvitelek listája"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "A list of active, completed and stopped file transfers"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Tisztítás"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Removes completed, cancelled and failed file transfers from the list"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Fileátvitel eltávolítása a listáról."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 #, fuzzy
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -8342,34 +8641,39 @@ msgstr ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Cancels the selected file transfer and removes incomplete file"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Fileküldés megszakítása"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Megszakítja a kiválasztott fileátvitelt"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Küld & Bezár"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Elrejti az ablakot"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 #, fuzzy
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notify me when a file transfer is complete"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 #, fuzzy
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Show a pop-up notification when a file transfer is complete "
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 #, fuzzy
 msgid "Shows a list of file transfers between you and others"
 msgstr "Shows a list of file transfers between you and others"
@@ -8379,7 +8683,7 @@ msgid "Register to"
 msgstr "Regisztráció ide: "
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8410,20 +8714,20 @@ msgstr "Betűtípus"
 msgid "Clear formatting"
 msgstr "Formázás törlése"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr ""
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Válasszon kliens tanusítványt"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr ""
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "Esemény típusa"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "Esemény leírása"
 
@@ -8485,7 +8789,7 @@ msgstr "<b>Betűtípus</b>"
 msgid "<b>#</b>"
 msgstr "<b>Betűtípus</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9251,10 +9555,6 @@ msgstr "_Megnyitás..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Bővített konfigurációszerkesztő</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Haladó"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "_Beszélgetés Indítása"
@@ -9499,7 +9799,7 @@ msgid "_Open Email Composer"
 msgstr "E-Mail Szerkesztő _Megnyitása"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "Beszélgetés _Indítása"
 
@@ -9544,6 +9844,10 @@ msgstr "Tulajdonságok"
 msgid "Default:"
 msgstr "Alapértelmezett"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Új partner felvétele"
@@ -9569,6 +9873,16 @@ msgstr "_Becenév:"
 msgid "_Group:"
 msgstr "_Csoport:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Felhasználói azonosító:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Becenév"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9607,6 +9921,11 @@ msgstr ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "Állapot üzenet _megváltoztatása"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Hangulat:</b>"
@@ -9828,10 +10147,9 @@ msgstr "_Parancs futtatása..."
 msgid "_Verify"
 msgstr "_Igazol"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Fiókok"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>EMunkamenet</b> információ)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9858,11 +10176,6 @@ msgstr "Csak az _aktív partnereket mutassa"
 msgid "Show Transports"
 msgstr "Mutassa a transzportokat"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Fileátvitelek"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9937,34 +10250,24 @@ msgstr "Tálcára helyezés automatikus csatlakozáskor"
 msgid "Pr_int status:"
 msgstr "Print status:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Leírás"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "Hiba _jelentése"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Minden bizonnyal nem kritikus, de ha szeretnéd, jelezheted a fejlesztőknek."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Feliratkozási kérelem"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "Hiba _jelentése"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Elutasít"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9972,16 +10275,11 @@ msgstr ""
 "Engedélyezés elutasítása a partnertől, tehát nem fogja tudni hogy "
 "csatlakozva vagy-e"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "Mű_veletek"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Engedélyez"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Partner engedélyezése, hogy lássa a csatlakozásod"
 
@@ -9999,11 +10297,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Jelenlét"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Barátok Meghívása!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -10012,15 +10310,20 @@ msgstr ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Kérem válasszon MUC szervert."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC szerver"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Meg_hív"
 
@@ -10143,11 +10446,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Takarít"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10310,6 +10608,15 @@ msgstr "Összes függő esemény mutatása"
 msgid "Mute Sounds"
 msgstr "Hangok némítása"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Tulajdonságok"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr ""
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Címzett:"
@@ -10712,14 +11019,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Szoba Konfiguráció"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber Azonnali üzenetküldő kliens"
@@ -10845,6 +11144,32 @@ msgid "Plugin manager"
 msgstr "Regisztráció nem sikerült"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP fiók %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Leírás"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>valaki@valahol.hu</b> azt szeretné, hogy <b>vegyél fel</b> néhány "
+#~ "ismerőst a névsorodba."
+
+#, fuzzy
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+
+#~ msgid "_Actions"
+#~ msgstr "Mű_veletek"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "python-dbus szükséges hozzá."
 
@@ -11046,12 +11371,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Hide all buttons in chat windows"
 #~ msgstr "Összes gomb elrejtése a beszélgetőablakokban"
 
-#~ msgid "File is empty"
-#~ msgstr "A file üres"
-
-#~ msgid "File does not exist"
-#~ msgstr "A file nem létezik"
-
 #, fuzzy
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
@@ -11082,55 +11401,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "python-pyopenssl szükséges hozzá."
 
-#~ msgid "?user status:_Available"
-#~ msgstr "_Elérhető"
-
-#~ msgid "?user status:Available"
-#~ msgstr "Elérhető"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Ismeretlen"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Hibái vannak"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Nincs"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Egyik sem"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Nincs"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "Nincs"
-
-#~ msgid "?print_status:All"
-#~ msgstr "Minden"
-
-#~ msgid "?print_status:None"
-#~ msgstr "Egyik sem"
-
-#~ msgid "?features:Available"
-#~ msgstr "Elérhető"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "fiók"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "állapot"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "üzenet"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "prioritás"
-
 #, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "room"
@@ -11143,33 +11413,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "?CLI:password"
 #~ msgstr "jelszó"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Közös beszélgetések"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Letöltés"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Feltöltés"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "Szüneteltetve"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Ismeretlen"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Ismeretlen"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "Ismeretlen"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "<b>Szerep:</b>"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr ""
 #~ "Használd a D-Bus-t és a Figyelmeztető-daemon-t a figyelmeztetések "
@@ -11383,9 +11626,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "Choose _Key..."
 #~ msgstr "Válasszon _Kulcsot..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "G_PG kezelő használata"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11534,18 +11774,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML bemenet</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Szűrés:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML bemenet</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Küld"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML parancssor ehhez: %s"
 
@@ -11998,9 +12226,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>EMunkamenet</b> információ)"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Írja be a Jabber azonosítót, vagy a partner nevét"
 
@@ -12011,13 +12236,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "All Chat Histories"
 #~ msgstr "All Chat Histories"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>valaki@valahol.hu</b> azt szeretné, hogy <b>vegyél fel</b> néhány "
-#~ "ismerőst a névsorodba."
-
 #~ msgid "More"
 #~ msgstr "Több"
 
diff --git a/po/it.po b/po/it.po
index 319e8d538..0c2ed5696 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2014-05-12 12:00+0200\n"
 "Last-Translator: Davide Pizzetti <erpizzo@alice.it>\n"
 "Language-Team: Gajim Translators\n"
@@ -30,20 +30,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Errore."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr "Ann_ulla"
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr "_Cancella"
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Inviare davvero il file?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Se invii un file a %s, lui/lei conoscerà il tuo vero ID Jabber."
@@ -98,69 +98,69 @@ msgstr "Tempo"
 msgid "Progress"
 msgstr "Progresso"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Dimensione: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Tu"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Salvato in: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Trasferimento del file completato"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 msgid "Open _Containing Folder"
 msgstr "Apri la cartella _contenitrice"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Trasferimento del file annullato"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "La connessione con il contatto non può essere stabilita."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Messaggio di errore: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Trasferimento del file interrotto"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, fuzzy, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -171,34 +171,34 @@ msgstr ""
 "in modo errato.\n"
 "Ricaricarlo?"
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Scegli il file da inviare..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Invia"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr "Un altro processo sta usando questo file."
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non è possibile sovrascrivere il file esistente \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -206,91 +206,91 @@ msgstr ""
 "Un file con lo stesso nome è già presente e non si ha il permesso per "
 "sovrascriverlo"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Cosa vuoi fare?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "La cartella \"%s\" non è scrivibile."
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Non hai il permesso di creare file in questa cartella."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 msgid "Save File as…"
 msgstr "Salva file come..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Verifica file..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 msgid "File error"
 msgstr "Errore file"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "File non valido"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "File: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare dei file vuoti"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Nome: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pausa"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Continua"
 
@@ -456,43 +456,63 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Richiede python-gupnp-igd."
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "?features:Disponibile"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Funzionalità"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Errore durante la lettura del file:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Errore processando il file:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Estensione non supportata."
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "L'immagine non può essere salvata in formato %(type)s. Salvarla come "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 msgid "Save Image as…"
 msgstr "Salva immagine come..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "Salv_a come "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Client:Sconosciuto"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Sconosciuto"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Time:Sconosciuto"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "?Role in Group Chat:<b>Ruolo:</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliazione:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -501,7 +521,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -510,14 +530,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Tu e il contatto siete reciprocamente interessati alle informazioni sulla "
 "presenza dell'altro"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -526,28 +546,38 @@ msgstr ""
 "Tu e il contatto siete reciprocamente interessati alle informazioni sulla "
 "presenza dell'altro"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Sei in attesa della risposta del contatto alla tua richiesta di abbonamento"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Non c'è nessuna richiesta di sottoscrizione in attesa."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Tutti i file"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Pulendo"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Gestisci i profili proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -588,13 +618,13 @@ msgid "_New Group Chat"
 msgstr "_Nuova conversazione di gruppo"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Non nei tuoi contatti"
 
@@ -606,7 +636,7 @@ msgstr "Vorrei aggiungerti ai miei contatti"
 msgid "Send Single _Message…"
 msgstr "Invia un _messaggio singolo…"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Invia uno s_tato personalizzato"
@@ -623,24 +653,24 @@ msgstr "_Gestisci il trasporto"
 msgid "_Modify Transport"
 msgstr "_Modifica il trasporto"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 msgid "_Rename…"
 msgstr "_Rinomina…"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Sblocca"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Blocca"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "_Elimina"
@@ -653,185 +683,205 @@ msgstr "_Informazioni"
 msgid "Send File..."
 msgstr "Invia file..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 msgid "Invite Contacts"
 msgstr "Invita contatti"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 msgid "Add to Roster"
 msgstr "Aggiungi all'elenco contatti"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr "Sessione audio"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr "Sessione video"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 msgid "Information"
 msgstr "Informazioni"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Cronologia"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 msgid "Manage Room"
 msgstr "Gestisci la stanza"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 msgid "Change Subject"
 msgstr "Cambia il soggetto"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 msgid "Configure Room"
 msgstr "Configura la stanza"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 msgid "Destroy Room"
 msgstr "Elimina la stanza"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 msgid "Change Nick"
 msgstr "Cambia soprannome"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 msgid "Bookmark Room"
 msgstr "Aggiungi stanza ai segnalibri"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 msgid "Request Voice"
 msgstr "Richiedi voce"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Messaggi predefiniti:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr "Minimizza alla chiusura"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "Esegui comando"
+
+#: gajim/gui_menu_builder.py:656
 msgid "Disconnect"
 msgstr "Disconnetti"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Unisciti alla conversazione di gruppo"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 msgid "Add Contact..."
 msgstr "Aggiungi contatto..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 msgid "Profile"
 msgstr "Profilo"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 msgid "Discover Services"
 msgstr "Ricerca servizi"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 msgid "Send Single Message..."
 msgstr "Invia un messaggio singolo..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avanzato"
+
+#: gajim/gui_menu_builder.py:737
 msgid "Archiving Preferences"
 msgstr "Archiviazione preferenze"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 msgid "Synchronise History"
 msgstr "Sincronizza cronologia"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Elenchi della privacy"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 msgid "Server Info"
 msgstr "Informazioni sul server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Console XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Amministratore"
+
+#: gajim/gui_menu_builder.py:744
 msgid "Send Server Message..."
 msgstr "Invia un messaggio del server..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Imposta il messaggio del giorno..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Aggiorna il messaggio del giorno..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 msgid "Delete MOTD..."
 msgstr "Elimina messaggio del giorno..."
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 msgid "No Accounts available"
 msgstr "Nessun account disponibile"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Account"
+
+#: gajim/history_manager.py:56
 msgid "Usage:"
 msgstr "Uso:"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 msgid "Options:"
 msgstr "Opzioni:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr "Mostra questo messaggio di aiuto ed esci"
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr "Scegli cartella per il logfile"
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare il database delle cronologie"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Messaggio"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Soggetto"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Vuoi ripulire il database? (FORTEMENTE SCONSIGLIATO SE GAJIM È IN ESECUZIONE)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -845,91 +895,91 @@ msgstr ""
 "\n"
 "Nel caso si prema SÌ, attendere..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr "Pulizia del database"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 msgid "Exporting History Logs…"
 msgstr "Esportazione dei registri delle cronologie..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s alle %(time)s ha detto: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Vuoi davvero eliminare i registri di %(jid)s?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Vuoi davvero eliminare i registri dei contatti selezionati?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 msgid "This can not be undone."
 msgstr "Questa azione non può essere annullata."
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr "Conferma dell'eliminazione"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Si vuole davvero eliminare il messaggio selezionato?"
 msgstr[1] "Si vogliono davvero eliminare i messaggi selezionati?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Questa è un'operazione irreversibile."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 msgid "Retrieving profile…"
 msgstr "Recupero profilo..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Non è stato possibile caricare l'immagine"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "Formato della data errato"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Il formato della data dev'essere AAAA-MM-GG"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informazioni ricevute"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Non sei connesso al server"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Senza una connessione, non è possibile pubblicare i propri dati personali."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 msgid "Sending profile…"
 msgstr "Invio profilo..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informazione NON pubblicata"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -947,10 +997,10 @@ msgstr "Nome del contatto: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Generale"
@@ -1040,35 +1090,35 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Per piacere, inserisci i dati del contatto che vuoi aggiungere"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente non deve contenere una risorsa."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Non puoi aggiungere te stesso all'elenco dei tuoi contatti."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Contatto già presente nell'elenco dei tuoi contatti"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nell'elenco dei tuoi contatti."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 msgid "Error while adding transport contact"
 msgstr "Errore durante l'aggiunta del contatto di trasporto"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1076,47 +1126,47 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Un client Jabber/XMPP GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, python-format
 msgid "GTK+ Version: %s"
 msgstr "Versione GTK+: %s"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, python-format
 msgid "PyGObject Version: %s"
 msgstr "Versione PyGObject: %s"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 msgid "Current Developers"
 msgstr "Sviluppatori attuali"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 msgid "Past Developers"
 msgstr "Sviluppatori passati"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr "Artisti"
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr "Per ultimo ma non meno importante"
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 msgid "we would like to thank all the package maintainers."
 msgstr "vogliamo ringraziare tutti i gestori dei pacchetti."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Alberto Paro <alberto@paro.homeunix.org>\n"
@@ -1130,12 +1180,12 @@ msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
 "Milo Casagrande <milo@ubuntu.com>"
 
-#: gajim/dialogs.py:1490
-#, python-format
-msgid "Dictionary for lang \"%s\" not available"
+#: gajim/dialogs.py:1485
+#, fuzzy, python-format
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Dizionario per la lingua \"%s\" non disponibile"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1148,12 +1198,12 @@ msgstr ""
 "\n"
 "La funzionalità di evidenziatura delle parole errate non verrà usata"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Connessione non sicura"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1167,281 +1217,304 @@ msgstr ""
 "sconsigliato.\n"
 "Si è sicuri di volerlo fare?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sì, voglio davvero connettermi in modo non sicuro"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim NON si connetterà a meno che non viene marcata questa casella"
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "_Non chiedermelo di nuovo"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "_Riprendi"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "Sos_tituisci"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Soprannome non valido"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 msgid "The nickname contains invalid characters."
 msgstr "Il soprannome contiene dei caratteri non consentiti."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Richiesta di abbonamento"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Richiesta di abbonamento per l'account %(account)s da %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Unisciti alla conversazione di gruppo"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 msgid "Invalid Room"
 msgstr "Stanza non valida"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr "Scegliere una stanza"
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Soprannome non valido"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 msgid "Please choose a nickname"
 msgstr "Scegli un altro soprannome"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Non è possibile unirsi a conversazione di gruppo quando non si è connessi."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 msgid "Wrong server"
 msgstr "Server errato"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, python-format
 msgid "%s is not a groupchat server"
 msgstr "%s non è un server di conversazione di gruppo"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nome"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Questo account non è connesso al server"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non puoi sincronizzarti con un account a meno che non sia connesso."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Sincronizza"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 msgid "Start new Conversation"
 msgstr "Comincia nuova conversazione"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Nuova Conversazione di Gruppo"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Aggiungi un nuovo contatto"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento di file"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Errore durante il trasferimento del file"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Trasferimento del file completato"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Trasferimento del file interrotto"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Invito in una conversazione di gruppo"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Il contatto ha cambiato stato"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo utilizzando l'account %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Modulo %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurati di essere connesso con \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Impossibile inviare un messaggio a %s, questo JID non è valido."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Pulendo"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtro:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Inserimento XML</b>"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Invia"
+
 # sostituisce %(action)s in:
 # <b>%(jid)s</b> vorrebbe che tu <b>%(action)s</b> alcuni contatti nel tuo elenco.
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "aggiungessi"
 
 # sostituisce %(action)s in:
 # <b>%(jid)s</b> vorrebbe che tu <b>%(action)s</b> alcuni contatti nel tuo elenco.
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "modificassi"
 
 # sostituisce %(action)s in:
 # <b>%(jid)s</b> vorrebbe che tu <b>%(action)s</b> alcuni contatti nel tuo elenco.
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "eliminassi"
 
 # %(action)s can be 'add', 'modify', 'remove' -> 'aggiungessi', 'modificassi', 'eliminassi'
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1450,180 +1523,180 @@ msgstr ""
 "<b>%(jid)s</b> vorrebbe che tu <b>%(action)s</b> alcuni contatti nella tua "
 "lista contatti."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Aggiungi"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Modifica"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Elimina"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Gruppi"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s mi ha suggerito di aggiungerti ai miei contatti."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Aggiunto %d contatto"
 msgstr[1] "Aggiunti %d contatti"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Rimosso %d contatto"
 msgstr[1] "Rimossi %d contatti"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Preferenze di archiviazione per %s"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr "Successo!"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Your Archiving Preferences have been saved!"
 msgstr "Le preferenze di archiviazione sono state salvate!"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr "Nessuna risposta dal server"
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr "È stato ricevuto un errore: {}"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 msgid "Error!"
 msgstr "Errore!"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 msgid "Add JID"
 msgstr "Aggiungi JID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Elenco della privacy <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Elenco della privacy per %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Elenco della privacy"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ordine: %(order)s, azione: %(action)s, tipo: %(type)s, valore: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordine: %(order)s, azione: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifica una regola</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Elenco della privacy per %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Nome dell'elenco non valido"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Sei stato invitato ad un conversazione di gruppo"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ti ha invitato a partecipare a una discussione"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ti ha invitato alla conversazione di gruppo %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Vuoi accettare l'invito?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr "Motivo (se non accetti):"
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "Selezionare #PCKS12 del Certificato Cliente"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "PKCS12 File"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Scegli un suono"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Scegli un'immagine"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Immagini"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "Seleziona un archivio"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "File zip"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aggiunta di una notifica speciale per %s in corso"
@@ -1632,7 +1705,7 @@ msgstr "Aggiunta di una notifica speciale per %s in corso"
 # %(contact)s wants to start %(type)s session with you. Do you want to answer the call?
 # Look at the translation of this string to better understand.
 # In italian translation, i just put "audio-video" because it will result in "iniziare una sessione audio-video".
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "audio-video"
 
@@ -1640,7 +1713,7 @@ msgstr "audio-video"
 # %(contact)s wants to start %(type)s session with you. Do you want to answer the call?
 # Look at the translation of this string to better understand.
 # In italian translation, i just put "audio" because it will result in "iniziare una sessione audio".
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "audio"
 
@@ -1648,12 +1721,12 @@ msgstr "audio"
 # %(contact)s wants to start %(type)s session with you. Do you want to answer the call?
 # Look at the translation of this string to better understand.
 # In italian translation, i just put "video" because it will result in "iniziare una sessione video".
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "video"
 
 # in italian translation, %(type)s will be one of: audio, video, audio-video.
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -1662,12 +1735,12 @@ msgstr ""
 "%(contact)s vuole iniziare una sessione %(type)s con te. Vuoi rispondere "
 "alla chiamata?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr "Certificato per l'account %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1710,69 +1783,97 @@ msgstr ""
 "\n"
 "Impronta digitale SHA256: %(sha256)s\n"
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Validazione del certificato SSL per %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr "Visualizza cert..."
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Trasferimenti di file"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Cifratura disattivata"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s è ora conosciuto come %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Invio di un messaggio privato fallito"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Non sei più nella conversazione di gruppo \"%(room)s\" oppure \"%(nick)s\" è "
 "uscito."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Il supporto metacontatti non è supportato dal tuo server"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Per piacere, specifica il nuovo soggetto:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Cambiamento del soprannome in corso"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specifica il nuovo soprannome che vuoi usare:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "ID Jabber della conversazione di gruppo non valido"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Eliminazione di %s in corso"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1781,247 +1882,257 @@ msgstr ""
 "Stai per cancellare definitivamente questa stanza.\n"
 "Puoi specificare il motivo qui sotto:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Puoi anche inserire un nome alternativo:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Inserisci il soprannome"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "e autenticata"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "e NON autenticata"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "cifratura %(type)s è attiva %(authenticated)s."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Conversazione con "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Conversazione continuata"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s ha impostato l'argomento a %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Tutti i partecipanti possono vedere il tuo JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr "La stanza ora mostra i membri non disponibili"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr "La stanza ora non mostra i membri non disponibili"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "La registrazione dei messaggi della stanza è stata disattivata"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "La stanza è ora completamente non anonima"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "La stanza è ora semi-anonima"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "La stanza ora è completamente anonima"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(jid)s è stato invitato in questa stanza"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "È stata creata una nuova stanza"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Il server ha assegnato o modificato il tuo soprannome"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato bloccato da %(who)s : %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ora sei conosciuto come %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s è stato cacciato dalla stanza (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "l'affiliazione è stata cambiata"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "la stanza è ora accessibile solo ai membri"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "spegnimento del sistema"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** L'affiliazione di %(nick)s è stata impostata a %(affiliation)s da "
 "%(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** L'affiliazione di %(nick)s è stata impostata a %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Il ruolo di %(nick)s è stato impostato a %(role)s da %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Il ruolo di %(nick)s è stato impostato a %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s se n'è andato"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s si è unito alla conversazione di gruppo"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Chiudendo questa finestra, si verrà disconnessi da questa stanza."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bloccando %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Trasferimenti di file"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Trasferimento del file fallito"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Mostra un elenco di formattazioni"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 #, fuzzy
 msgid "Formatting is not available so long as GPG is active"
 msgstr "Formattazione non disponibile quando GPG è attivo"
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
 msgstr "Questo contatto non supporta HTML"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s stato : %(state)s, motivo : %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s dalla conversazione di gruppo %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Negoziazione della sessione annullata"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "Questa sessione SARÀ registrata sul server"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "Questa sessione NON SARÀ registrata sul server"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Questa sessione è cifrata"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " e SARÀ registrata"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " e NON SARÀ registrata"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2029,16 +2140,16 @@ msgstr ""
 "Identità del contatto remoto non verificata. Clicca il pulsante a forma di "
 "scudo per maggiori dettagli."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "Cifratura E2E disabilitata"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2046,7 +2157,7 @@ msgstr ""
 "Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
 "verrà perso."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2055,7 +2166,7 @@ msgstr ""
 "Oggetto: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2064,90 +2175,90 @@ msgstr ""
 "Impossibile decifrare il messaggio da %s\n"
 "Potrebbe essere stato manomesso."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s è ora %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 msgid "File transfer"
 msgstr "Trasferimento del file"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr "Dimensione"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr "_Accetta"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Unisciti"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Il contatto remoto ha interrotto il trasferimento"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Errore nell'apertura del file"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Conversazioni di gruppo"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Trasporti"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 msgid "Authorization sent"
 msgstr "Autorizzazione inviata"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "La richiesta di iscrizione è stata inviata"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" accetta questa richiesta conoscerai il suo stato."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 msgid "Authorization removed"
 msgstr "Autorizzazione rimossa"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come non in linea."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr "Non è possibile utilizzare OpenPGP"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2159,11 +2270,11 @@ msgstr ""
 "gnupg.\n"
 "Verrete connessi a %s senza OpenPGP."
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Si sta partecipando ad una o più conversazioni di gruppo"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2171,27 +2282,27 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste conversazioni "
 "di gruppo. Diventare veramente invisibile?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "desincronizzato"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Vuoi uscire davvero da Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Sei sicuro di volere uscire da Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Chiudi sempre Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "Hai dei trasferimenti di file in corso"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
@@ -2199,11 +2310,11 @@ msgstr ""
 "Se si esce ora, i file in trasferimento saranno interrotti. Procedere "
 "comunque con l'uscita?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Ci sono dei messaggi non letti"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2211,17 +2322,17 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata e il contatto è nell'elenco dei tuoi contatti."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr ""
 "Devi leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2229,11 +2340,11 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2242,11 +2353,11 @@ msgstr ""
 "Non si potranno inviare e ricevere messaggi verso i contatti di questi "
 "trasporti: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Stai per bloccare un contatto. Sei sicuro di voler continuare?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
@@ -2254,57 +2365,57 @@ msgstr ""
 "Questo contatto ti vedrà non in linea e non riceverai i messaggi che ti "
 "manderà."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Rinomina il contatto"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserisci un nuovo soprannome per il contatto %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Rinomina il gruppo"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserisci un nuovo nome per il gruppo %s."
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Elimina il gruppo"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vuoi rimuovere il gruppo %s dal tuo gruppo?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Rimuovi anche tutti i contatti di questo gruppo dal tuo elenco"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" verrà rimosso dal tuo elenco"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Stai per rimuovere \"%(name)s\" (%(jid)s) dall'elenco dei tuoi contatti.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
 "always seeing you as offline."
@@ -2312,11 +2423,11 @@ msgstr ""
 "Eliminando questo contatto ne verrà rimossa anche l'autorizzazione, di "
 "conseguenza ti vedrà sempre non in linea."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Vuoi continuare?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2325,15 +2436,15 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questo ti "
 "vedrà sempre non in linea."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Voglio che questo contatto conosca il mio stato dopo la rimozione"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto verrà rimosso dall'elenco dei tuoi contatti"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2343,13 +2454,13 @@ msgstr ""
 "ne verrà rimossa anche l'autorizzazione. Questi ti vedranno sempre non in "
 "linea."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Stai per inviare uno stato personalizzato. Sei sicuro di voler continuare?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2358,25 +2469,25 @@ msgstr ""
 "Questo contatto ti vedrà temporaneamente come %(status)s, ma solo finché "
 "cambi di nuovo il tuo stato. Dopo lui/lei vedrà il tuo stato globale."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "È necessario creare un account prima di poter conversare con altri contatti."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibili"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -2384,12 +2495,12 @@ msgstr ""
 "Il tuo server non supporta il salvataggio di informazioni dei metacontatti. "
 "Perciò queste informazioni non saranno salvate alla prossima riconnessione."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2399,186 +2510,187 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account jabber o su "
 "vari transport."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "File URI non valido:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vuoi inviare questo file a %s:"
 msgstr[1] "Vuoi inviare questi file a %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Invia %s a %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "Rendi %s il primo contatto"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Rendi %s e %s metacontatti"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Cambia il messaggio di stato"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Pubblica il brano musicale"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "Pubblica la posizione"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 msgid "Configure Services…"
 msgstr "Configura i servizi..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Massimizza tutti"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Invia un m_essaggio di gruppo"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "A tutti gli utenti in linea"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_vita a"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Gestisci i contatti"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 msgid "Edit _Groups…"
 msgstr "Modifica i _gruppi…"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Massimizza"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Riconnetti"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Disconnetti"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Cronologia"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Gestore della cronologia"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Unisciti a una nuova conversazione di gruppo"
 
-#: gajim/roster_window.py:5774
-msgid "Change Status Message…"
-msgstr "Cambia il messaggio di stato…"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 msgid "Show the application's version"
 msgstr "Mostra la versione dell'applicazione"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 msgid "Show only critical errors"
 msgstr "Mostra solo gli errori critici"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Stampa xml stanza e altre informazioni di debug"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 msgid "Use defined profile in configuration directory"
 msgstr "Usa il profilo definito nella cartella di configurazione"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 msgid "Set configuration directory"
 msgstr "Imposta la cartella di configurazione"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr "Configura il sistema di registrazione degli eventi"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Mostra tutti gli _eventi in attesa"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Errore del database"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Cosa vuoi fare?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr "Tre mesi"
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr "Un anno"
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr "Tutto"
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 msgid "Connecting..."
 msgstr "Connessione in corso…"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s di %(max)s"
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, python-format
 msgid "Downloaded %s Messages"
 msgstr "Scaricati %s messaggi"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2587,7 +2699,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2595,7 +2707,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2739,16 +2851,16 @@ msgstr "L'account è disabilitato"
 msgid "To unregister from a server, account must be enabled."
 msgstr "Per de-registrarsi da un server, l'account deve essere abilitato."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "È richiesta una password"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Memorizza la password"
 
@@ -2778,10 +2890,18 @@ msgstr "Rimuovi solo da Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr "Non rimuovere nulla. Riproverò più tardi"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Tutti"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Nessuno"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Nuova Conversazione di Gruppo"
@@ -2848,11 +2968,11 @@ msgstr "Voce non valida"
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certificato già nel file"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2959,90 +3079,112 @@ msgstr "Evidenziatura dei messaggi nelle conversazioni di gruppo"
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in una conversazione di gruppo"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s di questa conversazione di gruppo"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Nessuno"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Proprietario"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [bloccato]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [minimizzata]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Connesso"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Scarica"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Invia"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Tipo: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Interrotto"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Completato"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:In pausa"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "In stallo"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Stato: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "?user status:Disponibile"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Disponibile per conversare"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Assente"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Occupato"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Non in linea"
 
@@ -3091,118 +3233,122 @@ msgstr "(Nessuna)"
 msgid "Hidden"
 msgstr "Nascosta"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr "Macchina in fase di sospensione"
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Cronologia delle conversazioni con %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Cronologia delle conversazioni"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Errore del disco"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ora è %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Errore: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Errore"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Soggetto: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 msgid "_Change Status Message…"
 msgstr "_Cambia il messaggio di stato…"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 msgid "_Manage Bookmarks…"
 msgstr "_Gestisci i segnalibri…"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "Nascondi l'elenco dei tuoi _contatti"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Mostra l'elenco dei tuoi _contatti"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Nascondi questo menù"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Formato multimediale non supportato: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "Questo campo è richiesto"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "nuovo@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nuovo%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 msgid "Hostname"
 msgstr "Nome host"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr "Software del server"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 msgid "Server Uptime"
 msgstr "Uptime del server"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3362,7 +3508,7 @@ msgstr "A_bbonati"
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3370,50 +3516,59 @@ msgstr ""
 "Il testo sotto a questa riga è quanto è stato detto dall'\n"
 "ultima volta che si è prestata attenzione a questa conversazione di gruppo"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Cita"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Azioni per \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _dizionario"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Manca un \"%s\" nell'URL del Dizionario e questo non è WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Apri come _link"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr "URL:"
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 msgid "Invalid URL"
 msgstr "URL non valido"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+#, fuzzy
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+"<b>Il messaggio è stato corretto. L'ultimo messaggio è stato:</b>\n"
+"  %s"
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3424,30 +3579,35 @@ msgstr[1] "%(nb_days)i giorni fa"
 msgid "Write a message.."
 msgstr "Scrivi un messaggio.."
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Stai per chiudere diverse schede"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Vuoi davvero chiuderle tutte?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Coversazioni di gruppo"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Conversazioni private"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Messaggi"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3460,111 +3620,111 @@ msgstr ""
 "è in uso o registrato da un altro partecipante del gruppo.\n"
 "Specificare un altro soprannome sotto:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Usa sempre questo soprannome quando c'è un conflitto"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Accetti questa richiesta?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accetti questa richiesta per l'account %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorizzazione HTTP (%(method)s) per %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "È necessaria una password per entrare nella stanza %s. Digitala, per piacere."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>%s</b> è pieno"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Sei stato bloccato dalla stanza <b>%s</b>."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "La conversazione di gruppo <b>%s</b> non esiste."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "La conversazione di gruppo <b>%s</b> non esiste."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Non è permessa la creazione di conversazioni di gruppo."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr ""
 "Il tuo soprannome registrato deve essere usato nella conversazione di gruppo "
 "<b>%s</b>."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non sei nella lista dei membri nella conversazione di gruppo %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Errore %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errore durante l'invio di %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Richiesta di iscrizione"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Osservatori"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3573,31 +3733,31 @@ msgstr ""
 "Lo/la vedrai sempre come non in linea.\n"
 "Vuoi rimuoverlo/la dall'elenco dei tuoi contatti?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Non abbonato"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Controlla la connessione o riprova più tardi."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s ha rifiutato l'invito: %(reason)s"
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s ha rifiutato l'invito"
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
@@ -3605,34 +3765,34 @@ msgstr ""
 "Gajim è stato configurato per usare un agente OpenPGP, ma non c'è nessun "
 "agente OpenPGP in esecuzione oppure ha restituito un passphrase errata.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sei connesso senza la chiave OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 msgid "Wrong passphrase"
 msgstr "Passphrase non corretta"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Frase di accesso errata"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 msgid "Certificate Passphrase Required"
 msgstr "Richiesta la frase di accesso per il certificato"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Inserire la frase di accesso del certificato per l'account %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Scegli la tua chiave OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
@@ -3640,97 +3800,102 @@ msgstr ""
 "La chiave OpenPGP usata per cifrare questa conversazione non è attendibile. "
 "Vuoi davvero cifrare questo messaggio?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 "Copiare / incollare il token di aggiornamento dal sito web appena aperto."
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr "Credenziali Oauth2"
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Errore del certificato SSL"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 msgid "File Transfer Failed"
 msgstr "Trasferimento del file fallito"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Trasferimento del file %(filename)s da %(name)s fallito."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Trasferimento del file %(filename)s da %(name)s interrotto."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Trasferimento del file %(filename)s da %(name)s fallito."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Invio di %(filename)s a %(name)s effettuato con successo."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Trasferimento del file %(filename)s a %(name)s interrotto."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Trasferimento del file %(filename)s a %(name)s fallito."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Scegli il file da inviare..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Non si è in grado di decifrare il messaggio"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Conflitto tra nomi utente"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Inserire un nuovo nome utente per l'account locale"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Conflitto tra risorse"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 "Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vuole iniziare una conversazione vocale."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Richiesta di conversazione vocale"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Errore nel verificare il certificato SSL"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3741,7 +3906,7 @@ msgstr ""
 "%(error)s\n"
 "Vuoi ancora connetterti a questo server?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3756,15 +3921,15 @@ msgstr ""
 "Impronta digitale SHA256 del certificato:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignora questo errore per questo certificato"
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr "Server non anonimo"
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3790,7 +3955,7 @@ msgstr ""
 "Procedere comunque con la connessione e aggiornare l'impronta digitale del "
 "certificato?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3798,7 +3963,7 @@ msgstr ""
 "Stai per inviare la tua password attraverso una connessione non sicura. "
 "Dovresti installare PyOpenSSL per evitarlo. Si è sicuri di volerlo fare?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3806,16 +3971,16 @@ msgstr ""
 "Stai per inviare la tua password non cifrata  attraverso una connessione non "
 "sicura. Sei sicuro di volerlo fare?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Questa non è una conversazione di gruppo"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Emoticon disabilitate"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3823,7 +3988,7 @@ msgstr ""
 "Il tema configurato per gli emoticon non è stato trovato, quindi gli "
 "emoticon sono stati disabilitati."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3832,11 +3997,11 @@ msgstr ""
 "Il tema configurato per gli emoticon non è stato trovato, quindi gli "
 "emoticon sono stati disabilitati."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Questa non è una conversazione di gruppo"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3844,42 +4009,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "predefinito"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Frase di accesso richiesta"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Inserire la frase di accesso della chiave OpenPGP %(keyid)s (account "
 "%(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 msgid "OpenPGP key expired"
 msgstr "Chiave OpenPGP scaduta"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "La tua chiave OpenPGP è scaduta, verrai connesso a %s senza OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Frase di accesso errata"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Per piacere, reinserisci la frase di accesso per OpenPGP o premi Annulla."
@@ -3949,6 +4114,11 @@ msgstr "- i messaggi verranno registrati"
 msgid "- messages will not be logged"
 msgstr "- i messaggi non verranno registrati"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3979,7 +4149,7 @@ msgstr "Modulo non valido"
 msgid "The form is not filled correctly."
 msgstr "Il modulo non è stato compilato correttamente."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Invisibile"
 
@@ -4112,6 +4282,58 @@ msgstr ""
 "%s\n"
 "La messaggistica sulla rete locale potrebbe non funzionare correttamente."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Impossibile avviare il servizio locale"
+
+#: gajim/dialog_messages.py:143
+#, fuzzy
+msgid "Got unexpected response from server (see log)"
+msgstr "Nessuna risposta dal server"
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Non è stato possibile caricare l'immagine"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Il servizio ha riportato un errore."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Non è stato possibile caricare l'immagine"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Cifratura attivata"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Nessuna connessione disponibile"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4137,7 +4359,17 @@ msgstr "Non è possibile eliminare il tema corrente"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Account uniti"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Utilizza un agente G_PG"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Torno subito."
 
@@ -4162,6 +4394,11 @@ msgstr ""
 "Tutte le finestre di conversazione e le conversazioni di gruppo saranno "
 "chiuse. Si desidera continuare?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Rimuovi"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4355,53 +4592,65 @@ msgstr "Cambia la password"
 msgid "Login Options"
 msgstr "Opzioni:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "D-Bus non è presente su questa macchina o il relativo modulo python è "
 "mancante"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Mostra un aiuto su di un comando specifico"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "comando"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "mostra l'aiuto sul comando"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Mostra o nascondi la finestra dei contatti"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Apre una finestra con il prossimo evento in attesa"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Stampa una lista di tutti i contatti nella lista contatti. Ogni contatto "
 "appare su una linea separata"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+msgid "?CLI:account"
+msgstr "?CLI:account"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "mostra solo i contatti dell'account dato"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Scrive un elenco degli account registrati"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Cambia lo stato degli account"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+msgid "?CLI:status"
+msgstr "?CLI:stato"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4409,11 +4658,16 @@ msgstr ""
 "uno fra: offline, online, chat, away, xa, dnd, invisible. Se non impostato, "
 "usa lo stato precedente dell'account"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+msgid "?CLI:message"
+msgstr "?CLI:messaggio"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "messaggio di stato"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4422,16 +4676,20 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Cambia la priorità dell'account o degli account"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+msgid "?CLI:priority"
+msgstr "?CLI:priorità"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "priorità che vuoi dare all'account"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4440,7 +4698,7 @@ msgstr ""
 "stato di tutti gli account che hanno marcata l'opzione \"sincronizza con lo "
 "stato globale\""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4450,30 +4708,30 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "contenuti dei messaggi"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se specificato, il messaggio verrà cifrato usando questa chiave pubblica"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4483,124 +4741,124 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "oggetto"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "oggetto del messaggio "
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Invia nuovi messaggi alla conversazione di gruppo in cui sei entrato."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID della stanza che riceverà il messaggio"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Invia un file ad un contatto"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "file"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Percorso del file"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'chiave' è il nome della preferenza, 'valore' è il valore a cui impostarla"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "chiave"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nome della preferenza da eliminare"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Scrive lo stato corrente delle preferenze di Gajim nel file .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Rimuove il contatto dal tuo elenco"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se specificato, il contatto è preso dalla lista contatti di questo account"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Restituisce lo stato corrente (quello globale se non è specificato un "
 "account)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Restituisce il messaggio di stato corrente (quello globale se non è "
 "specificato un account)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Restituisce il numero di messaggi non letti"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Invia un file XML personalizzato"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML da inviare"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4609,15 +4867,15 @@ msgstr ""
 "L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
 "tutti gli account."
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Cambia l'avatar"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Immagine da usare"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4625,19 +4883,19 @@ msgstr ""
 "L'account per il quale sarà impostato l'avatar; se non specificato, l'avatar "
 "verrà impostato per tutti gli account"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Controlla se Gajim è in esecuzione"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Mostra o nasconde la finestra di ipython"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4646,17 +4904,17 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Sembra che Gajim non sia in esecuzione. Quindi non puoi utilizzare gajim-"
 "remote"
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4665,16 +4923,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4687,7 +4945,7 @@ msgstr ""
 "\n"
 "Il comando è uno di:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4696,7 +4954,7 @@ msgstr ""
 "Troppi parametri. \n"
 "Scrivere \"%(basename)s help %(command)s\" per maggiori informazioni"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4870,11 +5128,6 @@ msgstr "Fine della settimana"
 msgid "Weekend!"
 msgstr "Fine-settimana!"
 
-#: gajim/common/passwords.py:84
-#, python-format
-msgid "XMPP account %s"
-msgstr "Account XMPP %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4899,52 +5152,52 @@ msgstr "La stanza è stata eliminata"
 msgid "You can join this room instead: %s"
 msgstr "Puoi invece entrare in questa stanza: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Errore SSL sconosciuto: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuovo messaggio singolo da %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuovo messaggio privato dalla conversazione di gruppo %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Messaggio inviato da %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuovo messaggio da %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ha cambiato stato"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s si è connesso"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s si è disconnesso"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Non nell'elenco dei tuoi contatti"
 
@@ -5805,22 +6058,18 @@ msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Gajim dovrebbe avviare automaticamente una sessione cifrata quando possibile?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Elenco ordinato (separato da spazi) dei tipi di connessione da provare. Può "
-"contenere tls, ssl o plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -5828,22 +6077,22 @@ msgstr ""
 "Mostrare un avvertimento prima di mandare una password su una connessione in "
 "chiaro. Può essere 'warn', 'connect', 'disconnect'"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Mostra un avvertimento prima di usare una libreria SSL standard."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Mostra un avvertimento prima di inviare una password IN CHIARO su una "
 "connessione in chiaro."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Elenco degli errori ssl da ignorare separati da spazi."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
@@ -5852,13 +6101,13 @@ msgstr ""
 "conversazioni. Puoi anche aggiungere il nome dell'account per non registrare "
 "nulla per questo account."
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
@@ -5866,15 +6115,15 @@ msgstr ""
 "Elenco dei JID separati da spazi per i quali accetti di non registrare le "
 "conversazioni se loro non vogliono. "
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Spazio bianco inviato dopo inattività"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "Ping XMPP inviato dopo inattività"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
@@ -5882,11 +6131,11 @@ msgstr ""
 "Quanti secondi attendere per la risposta ad un ping prima di un tentativo di "
 "riconnessione?"
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Workaround Jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5894,7 +6143,7 @@ msgstr ""
 "Se marcato, Gajim userà l'IP della macchina ed i proxy definiti nell'opzione "
 "file_transfer_proxies per il trasferimento dei file."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
@@ -5903,26 +6152,26 @@ msgstr ""
 "funzionino. È noto che questo test fallisce con i proxy Openfire anche se "
 "essi funzionano."
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Rispondi alle richieste di ricevuta"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Richieste di ricevuta inviate"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Consenti a Gajim di inviare informazioni sul sistema operativo che stai "
 "usando."
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "Consenti a Gajim di inviare la tua ora locale."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5930,11 +6179,11 @@ msgstr ""
 "Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
 "registrazione dei messaggi?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "Messaggio inviato ai contatti che vuoi aggiungere"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
@@ -5942,7 +6191,7 @@ msgstr ""
 "Se abilitato e se il server supporta questa funzionalità, Gajim riceverà "
 "messaggi inviati e ricevuti da altre risorse."
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
@@ -5950,22 +6199,22 @@ msgstr ""
 "Se abilitato, Gajim invierà il tuo IP locale in modo che il tuo contatto "
 "possa connettersi al tuo computer per trasferire file."
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Token più recente per autenticazione Oauth2."
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "client_id per autenticazione Oauth2."
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "redirect_url per autenticazione Oauth2."
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
@@ -5973,15 +6222,25 @@ msgstr ""
 "Lista di JID separati da spazi per i quali si vuole riaprire una finestra di "
 "conversazione al prossimo avvio. "
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Linguaggio per il quale vogliamo controllare le parole sbagliate"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
@@ -5989,7 +6248,7 @@ msgstr ""
 "Quante linee richiedere al server entrando in una conversazione di gruppo. "
 "-1 indica nessun limite, -2 indica il valore globale"
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
@@ -5998,11 +6257,11 @@ msgstr ""
 "Di quanti minuti prima richiedere i log entrando in una conversazione di "
 "gruppo. -1 indica nessun limite, -2 indica il valore globale"
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
@@ -6012,79 +6271,79 @@ msgstr ""
 "all'uscita da Gajim). Questa opzione NON DOVREBBE essere usata per "
 "(dis)attivare i plugin. Usare invece l'interfaccia grafica."
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Torno tra qualche minuto."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Mangio"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Lavoro"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefono"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Sono al telefono."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Fuori"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a godermi la vita."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Sono disponibile."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Solo disponibile per conversare."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Non sono disponibile."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6092,27 +6351,27 @@ msgstr ""
 "Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
 "muc_highlight_words, o quando un messaggio MUC contiene il tuo soprannome."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "human"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 msgid "Tor"
 msgstr "Tor"
 
@@ -6189,36 +6448,49 @@ msgstr "Tutti i messaggi non letti sono stati inoltrati."
 msgid "Forward unread message then disconnect"
 msgstr "Inoltra messaggi non letti e disconnetti"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Il file è vuoto"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Il file non esiste"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "creazione del database dei registri in corso"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "creazione della cache del database"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Invia %s a %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s è un file, ma dovrebbe essere una cartella"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s è una cartella ma dovrebbe essere un file"
@@ -6228,11 +6500,11 @@ msgstr "%s è una cartella ma dovrebbe essere un file"
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "Migrazione del database delle cronologie negli indici"
 
@@ -6241,190 +6513,190 @@ msgstr "Migrazione del database delle cronologie negli indici"
 msgid "%s is not a valid loglevel"
 msgstr "%s non è un livello di registro valido"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Impossibile ottenere il certificato dell'entità emittente"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Impossibile ottenere la CRL del certificato"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Impossibile decifrare la firma del certificato"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Impossibile decifrare la firma della CRL"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Impossibile decodificare la chiave pubblica dell'entità emittente"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Fallimento firma del certificato"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Fallimento firma CRL"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Il certificato non è ancora valido"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Il certificato è scaduto"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "La CRL non è ancora valida"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "La CRL è scaduta"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Errore di formato nel campo notBefore del certificato"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Errore di formato nel campo notAfter del certificato"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Errore di formato nel campo lastUpdate della CRL"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Errore di formato nel campo nextUpdate della CRL"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Certificato autofirmato"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificato autofirmato nella catena di certificazione"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Impossibile ottenere il certificato dell'entità emittente locale"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Impossibile verificare il primo certificato"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Catena di certificazione troppo lunga"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certificato revocato"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Certificato di una CA non valida"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Limite della lunghezza del percorso superato"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Scopo del certificato non supportato"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certificato non attendibile"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certificato rifiutato"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "L'entità emittente del soggetto non coincide"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "L'autorità e l'identificatore di chiave del soggetto non coincidono"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "L'autorità e il numero seriale dell'entità emittente non coincidono"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "L'uso della chiave non include la firma del certificato"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Fallimento verifica applicazione"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Riconnetti manualmente."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Il server %(name)s ha risposto in maniera errata alla richiesta di "
 "registrazione: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Il server %s ha fornito un modulo di registrazione differente"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Impossibile connettersi a \"%(host)s\" tramite il proxy \"%(proxy)s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Impossibile connettersi a \"%(host)s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Il server ha risposto: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Connessione al proxy fallita"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossibile connettersi all'account %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connessione con l'account %s persa. Riprova la connessione."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "L'autenticazione del certificato %s potrebbe non essere valida."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6433,7 +6705,7 @@ msgstr ""
 "\n"
 "Errore SSL: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6442,7 +6714,7 @@ msgstr ""
 "\n"
 "Errore SSL sconosciuto: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -6451,31 +6723,31 @@ msgstr ""
 "L'autenticità del certificato %s potrebbe non essere valida.\n"
 "Il certificato non copre questo dominio."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Contatto inviato: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Contatti inviati:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Non ottenuto a causa di stato invisibile"
 
@@ -7346,258 +7618,282 @@ msgstr "ingresso video"
 msgid "video output"
 msgstr "uscita video"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Il server deve essere tra 1 e 1023 caratteri"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Indirizzo del server richiesto."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Il nome utente deve essere tra 1 e 1023 caratteri"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "La risorsa deve essere tra 1 e 1023 caratteri"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Disponibile per conversare"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "?user status:_Disponibile"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Assente"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Non in linea"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?contact has status:Sconosciuto"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?contact has status:Ha degli errori"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Nessuno"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "A"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Da"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Entrambi"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Nessuno"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Nessuno"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "sta facendo qualcos'altro"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "sta scrivendo..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "ha smesso di scrivere"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o la scheda della conversazione"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d messaggio in attesa"
 msgstr[1] "%d messaggi in attesa"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " dalla stanza %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " dall'utente %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " da %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento in attesa"
 msgstr[1] "%d eventi in attesa"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Vorrei aggiungerti all'elenco dei miei contatti."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "Ciao, sono $name"
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Impossibile caricare l'immagine"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "L'immagine è troppo grande"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr "PyCURL non è installato"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 msgid "Error loading image"
 msgstr "Errore caricamento immagine"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "messaggio"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
@@ -7636,44 +7932,44 @@ msgstr ""
 "Il bus di sessione non è disponibile.\n"
 "Prova a leggere %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Per piacere, controlla se Avahi o Bonjour sono installati."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Impossibile avviare il servizio locale"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossibile collegarsi alla porta %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Controlla se avahi-daemon è in esecuzione."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossibile cambiare lo stato dell'account  \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Non è stato possibile inviare il tuo messaggio."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 "Il contatto non è in linea. Non è stato possibile inviare il tuo messaggio."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7915,6 +8211,11 @@ msgstr "_Blocca"
 msgid "_Add to Roster"
 msgstr "_Aggiungi all'elenco dei tuoi contatti"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "Esegui comando"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8193,11 +8494,11 @@ msgstr "A riguardo"
 msgid "Con_tinue"
 msgstr "_Continua"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Annulla"
@@ -8206,32 +8507,32 @@ msgstr "_Annulla"
 msgid "_Open Containing Folder"
 msgstr "_Apri la cartella di destinazione"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Trasferimenti di file"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "elenco dei trasferimenti di file"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Un elenco dei trasferimenti di file attivi, completati ed interrotti"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "P_ulisci"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Rimuove dalla lista i trasferimenti di file completati, annullati e falliti"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Rimuove il trasferimento file dalla lista."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8239,32 +8540,37 @@ msgstr ""
 "Questa azione elimina un singolo trasferimento file dalla lista. Se il "
 "trasferimento è attivo, viene prima interrotto e poi rimosso"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Annulla il trasferimento file selezionato e rimuove il file incompleto"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Annulla il trasferimento del file"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Annulla il trasferimento file selezionato"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "Invia e _chiudi"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Nasconde la finestra"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifica quando un trasferimento file viene completato"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Mostra una notifica popup quando un trasferimento file viene completato"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Mostra una lista dei trasferimenti di file"
 
@@ -8273,7 +8579,7 @@ msgid "Register to"
 msgstr "Registra a"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8304,20 +8610,20 @@ msgstr "Carattere"
 msgid "Clear formatting"
 msgstr "Pulisci la formattazione"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Mostra un elenco di emoticon (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Scegli il certificato del client"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Mostra un elenco di emoticon (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "Tipo di evento"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "Descrizione dell'evento"
 
@@ -8379,7 +8685,7 @@ msgstr "<b>Carattere</b>"
 msgid "<b>#</b>"
 msgstr "<b>Carattere</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9125,10 +9431,6 @@ msgstr "_Apri..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor di configurazione avanzata</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avanzato"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Inizia una _conversazione"
@@ -9366,7 +9668,7 @@ msgid "_Open Email Composer"
 msgstr "_Apri il compositore delle e-mail"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Inizia una conversazione"
 
@@ -9411,6 +9713,10 @@ msgstr "Preferenze"
 msgid "Default:"
 msgstr "Predefinito"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Aggiungi un nuovo contatto"
@@ -9436,6 +9742,16 @@ msgstr "_Soprannome:"
 msgid "_Group:"
 msgstr "_Gruppo:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID utente:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Soprannome"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9473,6 +9789,10 @@ msgstr ""
 "È necessario essere connesso al trasporto per poter\n"
 "aggiungere un contatto da questo protocollo."
 
+#: gajim/data/gui/roster_window.ui:61
+msgid "Change Status Message…"
+msgstr "Cambia il messaggio di stato…"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Stato d'animo:</b>"
@@ -9687,10 +10007,9 @@ msgstr "_Esegui un comando..."
 msgid "_Verify"
 msgstr "_Verifica"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Account"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(info <b>ESession</b>)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9717,11 +10036,6 @@ msgstr "Mostra solo i contatti _attivi"
 msgid "Show Transports"
 msgstr "Mostra i t_rasporti"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Trasferimenti di file"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9791,51 +10105,37 @@ msgstr "Minimizza all'entrata automatica"
 msgid "Pr_int status:"
 msgstr "St_ampa lo stato:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "descrizione"
-
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Report Bug"
-msgstr "_Segnala un bug"
-
-#: gajim/data/gui/exception_dialog.ui:89
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "È stato rilevato un errore di programmazione.\n"
 "Probabilmente non è fatale, ma dovrebbe comunque venire segnalato\n"
 "comunque agli sviluppatori."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Richiesta di abbonamento"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Segnala un bug"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Nega"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 "Nega l'autorizzazione al contatto cosicché non sappia quando sei connesso"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Azioni"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Autorizza"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autorizza il contatto affinché sappia quando sei connesso"
 
@@ -9853,11 +10153,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Presenza"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Invita degli amici!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9866,15 +10166,20 @@ msgstr ""
 "Stai per iniziare una conversazione di gruppo.\n"
 "Scegli i contatti che vuoi invitare"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Selezionare un server MUC."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Server MUC"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_vita"
 
@@ -9997,11 +10302,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Pulendo"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10164,6 +10464,16 @@ msgstr "Mostra tutti gli _eventi in attesa"
 msgid "Mute Sounds"
 msgstr "Disabilita i suoni"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferenze"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Esci"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "A:"
@@ -10572,15 +10882,6 @@ msgstr "Sovrascrivere?"
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-#, fuzzy
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip"
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Client IM Jabber"
@@ -10705,6 +11006,34 @@ msgstr "Cronologia dei registri"
 msgid "Plugin manager"
 msgstr "Plugin fallito"
 
+#~ msgid "XMPP account %s"
+#~ msgstr "Account XMPP %s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "descrizione"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>qualcuno@da_qualche_parte.com</b> vorrebbe che tu <b>aggiungessi</b> "
+#~ "dei contatti al tuo elenco."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Elenco ordinato (separato da spazi) dei tipi di connessione da provare. "
+#~ "Può contenere tls, ssl o plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Azioni"
+
+#, fuzzy
+#~ msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+#~ msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip"
+
 #~ msgid "UPower"
 #~ msgstr "UPower"
 
@@ -10928,12 +11257,6 @@ msgstr "Plugin fallito"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Nascondi i pulsanti della chat"
 
-#~ msgid "File is empty"
-#~ msgstr "Il file è vuoto"
-
-#~ msgid "File does not exist"
-#~ msgstr "Il file non esiste"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10960,51 +11283,6 @@ msgstr "Plugin fallito"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "Richiede python-pyopenssl > 0.12 e pyasn1."
 
-#~ msgid "?user status:_Available"
-#~ msgstr "?user status:_Disponibile"
-
-#~ msgid "?user status:Available"
-#~ msgstr "?user status:Disponibile"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?contact has status:Sconosciuto"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?contact has status:Ha degli errori"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Subscription we already have:Nessuno"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Ask (for Subscription):Nessuno"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Group Chat Contact Role:Nessuno"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Group Chat Contact Affiliation:Nessuno"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Tutti"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Nessuno"
-
-#~ msgid "?features:Available"
-#~ msgstr "?features:Disponibile"
-
-#~ msgid "?CLI:account"
-#~ msgstr "?CLI:account"
-
-#~ msgid "?CLI:status"
-#~ msgstr "?CLI:stato"
-
-#~ msgid "?CLI:message"
-#~ msgstr "?CLI:messaggio"
-
-#~ msgid "?CLI:priority"
-#~ msgstr "?CLI:priorità"
-
 #~ msgid "?CLI:uri"
 #~ msgstr "?CLI:uri"
 
@@ -11018,33 +11296,6 @@ msgstr "Plugin fallito"
 #~ msgstr "?CLI:password"
 
 #, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Coversazioni di gruppo"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Scarica"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Invia"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:In pausa"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Client:Sconosciuto"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Sconosciuto"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Time:Sconosciuto"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "?Role in Group Chat:<b>Ruolo:</b>"
-
-#, fuzzy
 #~ msgid "Credentials"
 #~ msgstr "Credenziali Oauth2"
 
@@ -11267,9 +11518,6 @@ msgstr "Plugin fallito"
 #~ msgid "Choose _Key..."
 #~ msgstr "Scegli la _chiave..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Utilizza un agente G_PG"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11417,17 +11665,6 @@ msgstr "Plugin fallito"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Inserimento XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtro:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Inserimento XML</b>"
-
-#~ msgid "Send"
-#~ msgstr "Invia"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Console XML per %s"
 
@@ -11910,9 +12147,6 @@ msgstr "Plugin fallito"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(info <b>ESession</b>)"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Inserire il JID o il nome del contatto"
 
@@ -11928,13 +12162,6 @@ msgstr "Plugin fallito"
 #~ msgid "homepage url"
 #~ msgstr "url della pagina iniziale"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>qualcuno@da_qualche_parte.com</b> vorrebbe che tu <b>aggiungessi</b> "
-#~ "dei contatti al tuo elenco."
-
 #~ msgid "More"
 #~ msgstr "Ancora"
 
@@ -11955,13 +12182,6 @@ msgstr "Plugin fallito"
 #~ msgid "Please check if avahi/bonjour-daemon is running."
 #~ msgstr "Controlla se avahi-daemon è in esecuzione."
 
-#~ msgid ""
-#~ "<b>Message was corrected. Last message was:</b>\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "<b>Il messaggio è stato corretto. L'ultimo messaggio è stato:</b>\n"
-#~ "  %s"
-
 #~ msgid "%s is not the name of a group chat."
 #~ msgstr "%s non è il nome di una conversazione di gruppo"
 
@@ -12811,9 +13031,6 @@ msgstr "Plugin fallito"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
@@ -12857,12 +13074,6 @@ msgstr "Plugin fallito"
 #~ "Utilizzo: /%s <azione>, invia l'azione alla stanza corrente. Usare la "
 #~ "terza persona (esempio: /%s esplode)."
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Cifratura attivata"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Cifratura disattivata"
-
 #~ msgid "Invite _Friends"
 #~ msgstr "Invita degli _amici"
 
diff --git a/po/ja.po b/po/ja.po
index 2a24c1007..123bccae8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\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"
@@ -22,25 +22,25 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "エラーです。"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr "元に戻す (_U)"
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
-msgstr "クリア (_C)"
+msgstr "消去 (_C)"
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "ファイルを送信しますか ?"
 
-#: gajim/chat_control_base.py:1102
-#, fuzzy, python-format
+#: gajim/chat_control_base.py:1168
+#, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
-"ファイルを %s に送信すると、その相手はあなたの本当の Jabber ID を知ることにな"
-"ります。"
+"ファイルを %s に送信すると、その相手はあなたの本当の JID を知ることになりま"
+"す。"
 
 #: gajim/session.py:446 gajim/session.py:506
 msgid "Confirm these session options"
@@ -92,73 +92,72 @@ msgstr "時間"
 msgid "Progress"
 msgstr "進捗"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "ファイル名: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "サイズ: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "あなた"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "送信者: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "受取人: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存場所: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "ファイルの転送が完了しました"
 
 # #(Mako)Containing をどうする
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
-#, fuzzy
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 msgid "Open _Containing Folder"
-msgstr "フォルダを開く (_O)"
+msgstr "フォルダを開く (_C)"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "ファイルの転送が中止されました"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "ピア接続は確立できません。"
 
 # (Mako) とりあえず「受取人」で
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "受取人: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "エラーメッセージ: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "ファイルの転送が中断しました"
 
-#: gajim/filetransfers_window.py:287
-#, fuzzy, python-format
+#: gajim/filetransfers_window.py:319
+#, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
 "the way.\n"
@@ -166,127 +165,123 @@ msgid ""
 msgstr ""
 "ファイル %(file)s を受け取りました。しかし、正しく受け取れていないようで"
 "す。\n"
-"リロードしますか ?"
+"もう一度ダウンロードしますか ?"
 
-#: gajim/filetransfers_window.py:315
-#, fuzzy
+#: gajim/filetransfers_window.py:345
 msgid "Choose File to Send…"
-msgstr "転送するファイルを選択..."
+msgstr "転送するファイルを選択…"
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "送信 (_S)"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "説明: "
 
-#: gajim/filetransfers_window.py:345
-#, fuzzy
+#: gajim/filetransfers_window.py:375
 msgid "Gajim can not read this file"
-msgstr "このファイルにアクセスできません"
+msgstr "Gajim はこのファイルを読むことができません"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
-msgstr ""
+msgstr "別のプロセスがこのファイルを使用中です。"
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "既存のファイル \"%s\" に上書きできません"
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "この名前のファイルは既に存在し、かつ上書きの権限がありません。"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "そのファイルは既に存在しています"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "何をしたいですか ?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "ディレクトリ \"%s\" に書き込む権限がありません"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "このディレクトリにファイルを作成する権限がありません。"
 
-#: gajim/filetransfers_window.py:432
-#, fuzzy
+#: gajim/filetransfers_window.py:462
 msgid "Save File as…"
-msgstr "ファイルの保存..."
+msgstr "ファイルの保存…"
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "ファイル: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "種類: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s さんがファイルを転送したがっています:"
 
-#: gajim/filetransfers_window.py:502
-#, fuzzy
+#: gajim/filetransfers_window.py:532
 msgid "Checking file…"
-msgstr "ファイルをチェックしています..."
+msgstr "ファイルをチェックしています…"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 msgid "File error"
 msgstr "ファイルのエラー"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/秒)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "ファイルが正しくありません"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "ファイル: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "空のファイルを転送することはできません"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "名前: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "送信者: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "一時停止"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "続ける (_C)"
 
@@ -334,9 +329,8 @@ msgid "OpenPGP message encryption"
 msgstr "OpenPGP メッセージ暗号化"
 
 #: gajim/features_window.py:57
-#, fuzzy
 msgid "Ability to encrypting chat messages with OpenPGP."
-msgstr "チャットメッセージを OpenPGP 鍵で暗号化します。"
+msgstr "チャットメッセージを OpenPGP 鍵で暗号化できます。"
 
 #: gajim/features_window.py:58
 msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
@@ -359,10 +353,12 @@ msgstr "パスワードを平文ではないようにして、安全に保存で
 msgid ""
 "Requires libsecret and a provider (such as GNOME Keyring and KSecretService)."
 msgstr ""
+"libsecret と、GNOME Keyring や KSecretService のようなマネージャーが必要で"
+"す。"
 
 #: gajim/features_window.py:63
 msgid "On Windows the Windows Credential Vault is used."
-msgstr ""
+msgstr "Windows では資格情報保存庫 (Windows Credential Vault) を使います。"
 
 #: gajim/features_window.py:64
 msgid "Spell Checker"
@@ -373,9 +369,8 @@ msgid "Spellchecking of composed messages."
 msgstr "入力するメッセージのスペルチェックをします。"
 
 #: gajim/features_window.py:66 gajim/features_window.py:67
-#, fuzzy
 msgid "Requires Gspell"
-msgstr "libgtkspell が必要です。"
+msgstr "Gspell が必要です。"
 
 #: gajim/features_window.py:68
 msgid "Automatic status"
@@ -445,49 +440,67 @@ msgstr "UPnP-IGD"
 msgid "Ability to request your router to forward port for file transfer."
 msgstr "ファイル転送のフォワードポートのためのルーターの要求を可能にします。"
 
+# …
 #: gajim/features_window.py:86
-#, fuzzy
 msgid "Requires gir1.2-gupnpigd-1.0."
-msgstr "python-gupnp-igd が必要です。"
+msgstr "gir1.2-gupnpigd-1.0 が必要です。"
+
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "有効"
 
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "機能"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "ファイル読み込みエラー:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "ファイル解析エラー:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "拡張はサポートされていません"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "画像を %(type)s 形式で保存できません。%(new_filename)s として保存しますか ?"
 
-#: gajim/gtkgui_helpers.py:537
-#, fuzzy
+#: gajim/gtkgui_helpers.py:507
 msgid "Save Image as…"
-msgstr "画像の保存..."
+msgstr "画像の保存…"
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "名前を付けて保存 (_A)"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "不明"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "不明"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "不明"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "<b>役:</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>分掌:</b>"
 
-#: gajim/vcard.py:392
-#, fuzzy
+#: gajim/vcard.py:389
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
@@ -495,48 +508,53 @@ msgstr ""
 "この相手先はあなたの在席情報に関心があります。しかし、あなたはこの相手先の在"
 "席情報に関心がありません。"
 
-#: gajim/vcard.py:394
-#, fuzzy
+#: gajim/vcard.py:391
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
-"あなたは相手先の在席情報に関心があります。しかし、相手先はあなたの在席情報に"
-"関心がありません。"
+"あなたは相手先の在席情報に関心があります。しかし、相手先はそうではありませ"
+"ん。"
 
-#: gajim/vcard.py:396
-#, fuzzy
+#: gajim/vcard.py:393
 msgid "The contact and you want to exchange presence information"
-msgstr "あなたと相手先は相互の在席情報に関心があります。"
+msgstr "あなたと相手先は相互の在席情報を送信します。"
 
-#: gajim/vcard.py:398
-#, fuzzy
+#: gajim/vcard.py:395
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
-msgstr "あなたと相手先は相互の在席情報に関心があります。"
+msgstr "あなたと相手先は相互の在席情報に関心がありません。"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "あなたからの在席通知の申し込みに対する相手先からの回答を待っています。"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "保留中の在席通知の申し込みはありません。"
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " リソース。優先順位は "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "すべてのファイル"
 
+#: gajim/options_dialog.py:392
+msgid "Clear File"
+msgstr "ファイルを消去"
+
+#: gajim/options_dialog.py:474
+msgid "Manage Proxies"
+msgstr "プロキシを管理"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -545,18 +563,16 @@ msgid "None"
 msgstr "なし"
 
 #: gajim/options_dialog.py:506
-#, fuzzy
 msgid "Adjust to Status"
-msgstr "在席状況に合わせる (_D)"
+msgstr "在席状況に合わせる"
 
 #: gajim/options_dialog.py:518
 msgid "On"
-msgstr ""
+msgstr "オン"
 
 #: gajim/options_dialog.py:518
-#, fuzzy
 msgid "Off"
-msgstr "オフライン"
+msgstr "オフ"
 
 #: gajim/options_dialog.py:556
 msgid "Failed to get secret keys"
@@ -579,13 +595,13 @@ msgid "_New Group Chat"
 msgstr "新しいグループチャット (_N)"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "名簿にありません"
 
@@ -594,19 +610,17 @@ msgid "I would like to add you to my roster"
 msgstr "私はあなたを名簿に追加したいと思っています"
 
 #: gajim/gui_menu_builder.py:508
-#, fuzzy
 msgid "Send Single _Message…"
-msgstr "単発メッセージを送信...(_M)"
+msgstr "単発メッセージを送信…(_M)"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "個別の在席状況を送信 (_T)"
 
 #: gajim/gui_menu_builder.py:541
-#, fuzzy
 msgid "E_xecute Command…"
-msgstr "コマンド実行"
+msgstr "コマンド実行…(_X)"
 
 #: gajim/gui_menu_builder.py:549
 msgid "_Manage Transport"
@@ -616,25 +630,24 @@ msgstr "中継先の管理 (_M)"
 msgid "_Modify Transport"
 msgstr "中継先の変更 (_M)"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
-#, fuzzy
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 msgid "_Rename…"
-msgstr "名前の変更 (_N)"
+msgstr "名前の変更…(_R)"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "遮断の解除 (_U)"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "遮断 (_B)"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "削除 (_V)"
@@ -644,207 +657,198 @@ msgid "_Information"
 msgstr "情報 (_I)"
 
 #: gajim/gui_menu_builder.py:611
-#, fuzzy
 msgid "Send File..."
-msgstr "ファイルを送信...(_S)"
+msgstr "ファイルを送信..."
 
-#: gajim/gui_menu_builder.py:612
-#, fuzzy
+#: gajim/gui_menu_builder.py:615
 msgid "Invite Contacts"
-msgstr "相手先を招待 (_C)"
+msgstr "相手先を招待"
 
-#: gajim/gui_menu_builder.py:613
-#, fuzzy
+#: gajim/gui_menu_builder.py:616
 msgid "Add to Roster"
-msgstr "名簿に追加 (A)"
+msgstr "名簿に追加"
 
-#: gajim/gui_menu_builder.py:614
-#, fuzzy
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
-msgstr "音声テスト"
+msgstr "音声会話"
 
-#: gajim/gui_menu_builder.py:615
-#, fuzzy
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
-msgstr "ビデオのテスト"
+msgstr "ビデオ会話"
 
-#: gajim/gui_menu_builder.py:616
-#, fuzzy
+#: gajim/gui_menu_builder.py:619
 msgid "Information"
-msgstr "情報 (_I)"
+msgstr "情報"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
-#, fuzzy
 msgid "History"
-msgstr "履歴 (_H)"
+msgstr "履歴"
 
-#: gajim/gui_menu_builder.py:635
-#, fuzzy
+#: gajim/gui_menu_builder.py:644
 msgid "Manage Room"
-msgstr "談話室を管理 (_M)"
+msgstr "談話室を管理"
 
-#: gajim/gui_menu_builder.py:636
-#, fuzzy
+#: gajim/gui_menu_builder.py:645
 msgid "Change Subject"
-msgstr "談話室の題を変更...(_S)"
+msgstr "談話室の題を変更"
 
-#: gajim/gui_menu_builder.py:637
-#, fuzzy
+#: gajim/gui_menu_builder.py:646
 msgid "Configure Room"
-msgstr "談話室を調整...(_R)"
+msgstr "談話室を調整"
 
-#: gajim/gui_menu_builder.py:638
-#, fuzzy
+#: gajim/gui_menu_builder.py:647
 msgid "Destroy Room"
-msgstr "談話室を閉鎖 (_D)"
+msgstr "談話室を閉鎖"
 
-#: gajim/gui_menu_builder.py:640
-#, fuzzy
+#: gajim/gui_menu_builder.py:649
 msgid "Change Nick"
-msgstr "ニックネームを変更...(_N)"
+msgstr "ニックネームを変更"
 
-#: gajim/gui_menu_builder.py:641
-#, fuzzy
+#: gajim/gui_menu_builder.py:650
 msgid "Bookmark Room"
-msgstr "この談話室をブックマークする (_B)"
+msgstr "この談話室をブックマークする"
 
-#: gajim/gui_menu_builder.py:642
-#, fuzzy
+#: gajim/gui_menu_builder.py:651
 msgid "Request Voice"
-msgstr "発言権を要求 (_R)"
+msgstr "発言権を要求"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
-#, fuzzy
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
-msgstr "用意されたメッセージ:"
+msgstr "すべてのメッセージを通知する"
 
-#: gajim/gui_menu_builder.py:644
-#, fuzzy
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
-msgstr "閉じるボタンで最小化 (_M)"
+msgstr "閉じるボタンで最小化"
 
-#: gajim/gui_menu_builder.py:646
-#, fuzzy
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+msgid "Execute command"
+msgstr "コマンドを実行"
+
+#: gajim/gui_menu_builder.py:656
 msgid "Disconnect"
-msgstr "切断 (_D)"
+msgstr "切断"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "グループチャットに参加"
 
-#: gajim/gui_menu_builder.py:721
-#, fuzzy
+#: gajim/gui_menu_builder.py:731
 msgid "Add Contact..."
-msgstr "相手先リストに追加...(_A)"
+msgstr "相手先リストに追加..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
-#, fuzzy
 msgid "Profile"
-msgstr "ファイル"
+msgstr "プロフィール"
 
-#: gajim/gui_menu_builder.py:724
-#, fuzzy
+#: gajim/gui_menu_builder.py:734
 msgid "Discover Services"
-msgstr "サービスを探索 (_D)"
+msgstr "サービスを探索"
 
-#: gajim/gui_menu_builder.py:725
-#, fuzzy
+#: gajim/gui_menu_builder.py:735
 msgid "Send Single Message..."
-msgstr "単発メッセージを送信...(_M)"
+msgstr "単発メッセージを送信..."
 
-#: gajim/gui_menu_builder.py:727
-#, fuzzy
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "拡張"
+
+#: gajim/gui_menu_builder.py:737
 msgid "Archiving Preferences"
-msgstr "書庫の設定を編集 (_V)"
+msgstr "書庫の設定"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
-#, fuzzy
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 msgid "Synchronise History"
-msgstr "同調"
+msgstr "履歴を同期"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "プライバシーリスト"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
-#, fuzzy
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 msgid "Server Info"
-msgstr "サーバー"
+msgstr "サーバー情報"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML コンソール"
 
-#: gajim/gui_menu_builder.py:734
-#, fuzzy
+#: gajim/gui_menu_builder.py:743
+msgid "Admin"
+msgstr "管理"
+
+#: gajim/gui_menu_builder.py:744
 msgid "Send Server Message..."
-msgstr "サーバーメッセージを送信...(_S)"
+msgstr "サーバーメッセージを送信"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "MOTD を設定..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "MOTD を更新..."
 
-#: gajim/gui_menu_builder.py:737
-#, fuzzy
+#: gajim/gui_menu_builder.py:747
 msgid "Delete MOTD..."
-msgstr "MOTD を削除"
+msgstr "MOTD を削除..."
 
-#: gajim/gui_menu_builder.py:777
-#, fuzzy
+#: gajim/gui_menu_builder.py:787
 msgid "No Accounts available"
 msgstr "アカウントがありません"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "アカウント"
+
+#: gajim/history_manager.py:56
 msgid "Usage:"
 msgstr "使い方:"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 msgid "Options:"
 msgstr "オプション:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr "このヘルプを表示して終了"
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
-msgstr ""
+msgstr "記録ファイルのフォルダーを選択してください"
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "履歴記録データベースが見つかりません"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "日付"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "メッセージ"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "題"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -852,8 +856,7 @@ msgstr ""
 "データベースを消去しますか ? (Gajim が起動している場合、まったくお勧めできま"
 "せん)"
 
-#: gajim/history_manager.py:243
-#, fuzzy
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -865,96 +868,91 @@ msgstr ""
 "データベース領域を本当に消去する場合は YES を、そうでなければ NO をクリックし"
 "てください。\n"
 "\n"
-"YES をクリックした場合、しばらくお待ちください..."
+"YES をクリックした場合、しばらくお待ちください…"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr "データベースの掃除"
 
-#: gajim/history_manager.py:463
-#, fuzzy
+#: gajim/history_manager.py:462
 msgid "Exporting History Logs…"
-msgstr "履歴記録を書き出しています..."
+msgstr "履歴記録を書き出しています…"
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s 、%(who)s さんは言いました: %(message)s\n"
 
-#: gajim/history_manager.py:577
-#, fuzzy, python-format
+#: gajim/history_manager.py:576
+#, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "本当に、%(jid)s の記録を削除しますか ?"
 
-#: gajim/history_manager.py:581
-#, fuzzy
+#: gajim/history_manager.py:580
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "本当に、選択した相手先の記録を削除しますか ?"
 
-#: gajim/history_manager.py:583
-#, fuzzy
+#: gajim/history_manager.py:582
 msgid "This can not be undone."
-msgstr "サービスが見つかりませんでした"
+msgstr "元に戻すことができません。"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr "削除の確認"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "本当に、選択したメッセージを削除しますか ?"
 msgstr[1] "本当に、選択したメッセージを削除しますか ?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "これは不可逆的な操作です。"
 
-#: gajim/profile_window.py:66
-#, fuzzy
+#: gajim/profile_window.py:63
 msgid "Retrieving profile…"
-msgstr "プロフィールを取得中..."
+msgstr "プロフィールを取得中…"
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "画像を読み込めませんでした"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "日付の書式が正しくありません"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "日付の書式は YYYY-MM-DD としてください"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "情報を受信しました"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "サーバーに接続していません"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 msgid "Without a connection, you can not publish your contact information."
 msgstr "接続しないと、情報を公開できません。"
 
-#: gajim/profile_window.py:351
-#, fuzzy
+#: gajim/profile_window.py:349
 msgid "Sending profile…"
-msgstr "プロフィールを送信しています..."
+msgstr "プロフィールを送信しています…"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "情報は公開されません"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard の公開に失敗しました"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -966,14 +964,14 @@ msgid "Contact name: <i>%s</i>"
 msgstr "相手先名: <i>%s</i>"
 
 #: gajim/dialogs.py:97
-#, fuzzy, python-format
+#, python-format
 msgid "JID: <i>%s</i>"
-msgstr "Jabber ID: <i>%s</i>"
+msgstr "JID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "全般"
@@ -1026,7 +1024,7 @@ msgstr "この状況メッセージの名前を入力してください"
 
 #: gajim/dialogs.py:855
 msgid "JID:"
-msgstr ""
+msgstr "JID:"
 
 #: gajim/dialogs.py:856
 msgid "AIM Address:"
@@ -1049,127 +1047,123 @@ msgid "Yahoo! Address:"
 msgstr "Yahoo! アドレス:"
 
 #: gajim/dialogs.py:897
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Please fill in the data of the contact you want to add to your account <b>"
 "%s</b>"
-msgstr ""
-"アカウント <b>%s</b> に追加する相手先の情報を\n"
-"入力してください"
+msgstr "アカウント <b>%s</b> に追加する相手先の情報を入力してください"
 
 #: gajim/dialogs.py:900
 msgid "Please fill in the data of the contact you want to add"
 msgstr "追加する相手先の情報を入力してください"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "ユーザー ID が正しくありません"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "ユーザー ID にはリソースを含めないでください。"
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "あなた自身は名簿に追加できません。"
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "相手先は既に名簿にあります"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "この相手先は既に名簿に登録されています。"
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ユーザー ID:"
 
-#: gajim/dialogs.py:1277
-#, fuzzy
+#: gajim/dialogs.py:1272
 msgid "Error while adding transport contact"
-msgstr "サービスの追加中のエラーです。%s"
+msgstr "中継先の追加中のエラー"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
 "\n"
 "%(error)s"
 msgstr ""
+"このエラーは、中継先 %(transport)s の相手先を追加する際に起こりました:\n"
+"\n"
+"%(error)s"
 
-#: gajim/dialogs.py:1310
-#, fuzzy
+#: gajim/dialogs.py:1305
 msgid "A GTK+ XMPP client"
-msgstr "GTK+ Jabber/XMPP クライアント"
+msgstr "GTK+ XMPP クライアント"
 
-#: gajim/dialogs.py:1311
-#, fuzzy, python-format
+#: gajim/dialogs.py:1306
+#, python-format
 msgid "GTK+ Version: %s"
-msgstr "GTK+ バージョン:"
+msgstr "GTK+ バージョン: %s"
 
-#: gajim/dialogs.py:1312
-#, fuzzy, python-format
+#: gajim/dialogs.py:1307
+#, python-format
 msgid "PyGObject Version: %s"
-msgstr "PyGobject バージョン:"
+msgstr "PyGObject バージョン: %s"
 
-#: gajim/dialogs.py:1313
-#, fuzzy, python-format
+#: gajim/dialogs.py:1308
+#, python-format
 msgid "python-nbxmpp Version: %s"
-msgstr "python-nbxmpp バージョン:"
+msgstr "python-nbxmpp バージョン: %s"
 
-#: gajim/dialogs.py:1316
-#, fuzzy
+#: gajim/dialogs.py:1311
 msgid "Current Developers"
-msgstr "現在の開発者:"
+msgstr "現在の開発者"
 
-#: gajim/dialogs.py:1317
-#, fuzzy
+#: gajim/dialogs.py:1312
 msgid "Past Developers"
-msgstr "過去の開発者:"
+msgstr "過去の開発者"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
-msgstr ""
+msgstr "アーティスト"
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
-msgstr ""
+msgstr "最後に大切なことを付け加えますと、"
 
-#: gajim/dialogs.py:1323
-#, fuzzy
+#: gajim/dialogs.py:1318
 msgid "we would like to thank all the package maintainers."
-msgstr "最後に、すべてのパッケージのメンテナに感謝いたします。"
+msgstr "すべてのパッケージのメンテナに感謝いたします。"
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
-msgstr "Mako (mako AT pasero.net)"
+msgstr "Mako N (mako AT pasero.net)"
 
-#: gajim/dialogs.py:1490
-#, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
-msgstr "言語 %s の辞書はありません"
+#: gajim/dialogs.py:1485
+#, python-format
+msgid "Dictionary for language \"%s\" not available"
+msgstr "言語 \"%s\" の辞書はありません"
 
-#: gajim/dialogs.py:1491
-#, fuzzy, python-format
+#: gajim/dialogs.py:1486
+#, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
 "another language by setting the speller_language option.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"スペルチェックを使うには、%s の辞書をインストールしてください。あるいは、"
+"スペルチェックを使うには、\"%s\" の辞書をインストールしてください。あるいは、"
 "speller_language オプションで別の言語を選択してください。\n"
 "\n"
 "スペル間違いの強調表示は使われません"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "安全でない接続"
 
-#: gajim/dialogs.py:1839
-#, fuzzy, python-format
+#: gajim/dialogs.py:1834
+#, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
 "This means conversations will not be encrypted, and is strongly "
@@ -1177,280 +1171,294 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr ""
 "安全でない接続でアカウント %(account)s (サーバー %(server)s) に接続しようとし"
-"ています。これは、すべての会話が暗号化されずに交わされること意味します。この"
-"タイプの接続はまったく推奨しません。\n"
+"ています。これは、すべての会話が暗号化されずに交わされること意味します。まっ"
+"たく推奨しません。\n"
 "それでも続けますか ?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "はい。安全でないまま接続します"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "このボックスにチェックしなければ、Gajim は接続しません"
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "次回から質問しない (_D)"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "残す (_R)"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "置換する (_P)"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "ニックネームは有効ではありません"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 msgid "The nickname contains invalid characters."
 msgstr "ニックネームに使用できない文字が含まれています。"
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "在席通知の申し込み"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "アカウント %(account)s に対して、%(jid)s さんからの在席通知の申し込み"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s さんから在席通知の申し込み"
 
-#: gajim/dialogs.py:2364
-#, fuzzy
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 msgid "Join Groupchat"
 msgstr "グループチャットに参加"
 
-#: gajim/dialogs.py:2506
-#, fuzzy
+#: gajim/dialogs.py:2500
 msgid "Invalid Room"
-msgstr "談話室名が正しくありません"
+msgstr "談話室が正しくありません"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
-msgstr ""
+msgstr "談話室を選択してください"
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "ニックネームが正しくありません"
 
-#: gajim/dialogs.py:2520
-#, fuzzy
+#: gajim/dialogs.py:2514
 msgid "Please choose a nickname"
-msgstr "名前をつけて、新しいテーマを作成してください。"
+msgstr "ニックネームをつけてください"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "JID が正しくありません"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "接続しないと、グループチャットに参加できません。"
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 msgid "Wrong server"
 msgstr "サーバーが正しくありません"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, python-format
 msgid "%s is not a groupchat server"
 msgstr "%s はグループチャットのサーバーではありません"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "接続していないと、相手先を合わせることはできません。"
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "名前"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "サーバー"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "このアカウントはサーバーに接続していません"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "接続していないと、相手先に合わせることはできません。"
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "同調"
 
-#: gajim/dialogs.py:2778
-#, fuzzy
+#: gajim/dialogs.py:2772
 msgid "Start new Conversation"
-msgstr "会話中"
+msgstr "新しく会話を開始"
 
-#: gajim/dialogs.py:3033
-#, fuzzy
+#: gajim/dialogs.py:3028
 msgid "New Groupchat"
 msgstr "新しいグループチャット"
 
-#: gajim/dialogs.py:3035
-#, fuzzy
+#: gajim/dialogs.py:3030
 msgid "New Contact"
-msgstr "新しい相手先を追加する"
+msgstr "新しい相手先"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "接続しないと、パスワードは変更できません。"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "パスワードが正しくありません。"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "パスワードを入力してください。"
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "ふたつの欄のパスワードは同じにしてください。"
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "相手先がサインインしました"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "相手先がサインアウトしました"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "新着メッセージ"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "新着の単発メッセージ"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "新着の私信"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "新着メール"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "ファイル転送の要求"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "ファイル転送のエラー"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "ファイルの転送の完了"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "ファイルの転送の中断"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "グループチャットへの招待"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "相手先が在席状況を変更"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "アカウント %s で単発メッセージ"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "アカウント %s で単発メッセージ"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "単発メッセージ"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "%s を送信"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "%s を受信"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "フォーム %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "接続していません"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" に接続していることを確認してください。"
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "%s さんにメッセージを送れません。JID が正しくありません。"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+msgid "Clear"
+msgstr "消去"
+
+#: gajim/dialogs.py:3563
+msgid "Filter"
+msgstr "フィルター"
+
+#: gajim/dialogs.py:3568
+msgid "XML Input"
+msgstr "XML 入力"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "送信"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "追加"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "変更"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "削除"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1459,197 +1467,196 @@ msgstr ""
 "<b>%(jid)s</b> さんは、あなたの名簿にあるいくつかの相手先に <b>%(action)s</"
 "b> を行うよう、求めています。"
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "追加"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "変更"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "削除"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "グループ"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "あなたを名簿に追加するよう、%s さんは私に勧めました。"
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "%d 件の相手先を追加しました"
 msgstr[1] "%d 件の相手先を追加しました"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "%d 件の相手先を削除しました"
 msgstr[1] "%d 件の相手先を削除しました"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s の書庫の設定"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr "成功 !"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Your Archiving Preferences have been saved!"
 msgstr "書庫の設定を保存しました。"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr "サーバーからの応答がありません"
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr "エラーを受け取りました: {}"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 msgid "Error!"
 msgstr "エラー !"
 
-#: gajim/dialogs.py:4117
-#, fuzzy
+#: gajim/dialogs.py:4120
 msgid "Add JID"
-msgstr "Jabber ID を追加"
+msgstr "JID を追加"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "プライバシーリスト <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s のプライバシーリスト"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "プライバシーリスト"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "順位: %(order)s, 操作: %(action)s, 型: %(type)s, 値: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "順位: %(order)s, 操作: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>規則の編集</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>規則の追加</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s のプライバシーリスト"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "リスト名が正しくありません"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "プライバシーリストを作成するには、名前を入力してください。"
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "グループチャットへの招待を受けました"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact さんがあなたを議論に参加するよう招待しています"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact さんがあなたをグループチャット %(room_jid)s へ招待しています"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "コメント: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "招待に応じますか ?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr "理由 (断る場合)"
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "#PCKS12 形式のクライアント証明書の選択"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "PKCS12 形式のファイル"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "サウンドの選択"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "WAV サウンド"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "画像の選択"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "画像"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "書庫の選択"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "Zip ファイル"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s が次のようになったとき:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "%s の特別通知の追加"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "音声とビデオ"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "音声"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "ビデオ"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -1658,13 +1665,13 @@ msgstr ""
 "%(contact)s さんは、%(type)s でセッションを始めようとしています。呼び出しに応"
 "じますか ?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr "アカウント %s の証明書"
 
-#: gajim/dialogs.py:5339
-#, fuzzy, python-format
+#: gajim/dialogs.py:5333
+#, python-format
 msgid ""
 "<b>Issued to:</b>\n"
 "Common Name (CN): %(scn)s\n"
@@ -1702,75 +1709,96 @@ msgstr ""
 "有効期限: %(eo)s\n"
 "\n"
 "<b>指紋</b>\n"
-"SHA1 指紋: %(sha1)s\n"
+"SHA-1 指紋: %(sha1)s\n"
 "\n"
 "SHA256 指紋: %(sha256)s\n"
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "%s のSSL 証明書の検証"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
-#, fuzzy
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
-msgstr "証明書を表示..."
+msgstr "証明書を表示…"
+
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+msgid "File Transfer"
+msgstr "ファイルを転送"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+msgid "Encrypting file..."
+msgstr "ファイルを暗号化..."
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s さんは現在 %(new_nick)s さんと認識されました"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s さんは現在 %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "私信の送信に失敗しました"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "あなたが既にグループチャット \"%(room)s\" にいないか、あるいは \"%(nick)s\" "
 "さんがいません。"
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr "HTTP ファイルアップロード"
+
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr "サーバーは HTTP ファイルアップロードに対応していません"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "題の変更"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "新しい題を入力してください:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "ニックネームの変更"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "使用する新しいニックネームを入力してください:"
 
-#: gajim/groupchat_control.py:620
-#, fuzzy
+#: gajim/groupchat_control.py:677
 msgid "Invalid group chat JID"
 msgstr "グループチャットの JID が正しくありません"
 
-#: gajim/groupchat_control.py:621
-#, fuzzy
+#: gajim/groupchat_control.py:678
 msgid "The group chat JID has not allowed characters."
 msgstr "グループチャットの JID に使えない文字が含まれています。"
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "%s の閉鎖"
 
-#: gajim/groupchat_control.py:628
-#, fuzzy
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
@@ -1778,252 +1806,256 @@ msgstr ""
 "この談話室を閉鎖しようとしています。\n"
 "下に理由を入力できます:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "また、代替の談話室を入力できます:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "ニックネームを挿入"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "認証されています"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "認証されていません"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
-#, fuzzy, python-format
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
+#, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
-msgstr ""
-"%(type)s の暗号化は有効%(status)s、%(authenticated)s。\n"
-"チャットは%(logged)s。"
+msgstr "%(type)s の暗号化は有効 %(authenticated)s。"
 
 # (Mako) 語順が問題。コロンでごまかしてみる
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "会話中: "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "会話中"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s さんは題を %(subject)s に設定しました"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "在室者の誰もがあなたのフルJID を知ることができます"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr "談話室はメンバー以外にも見えます"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr "談話室はメンバー以外には見えません"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
-msgstr ""
+msgstr "プライバシーに関係のない設定が変更されました"
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "談話室の記録を取りはじめます"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "談話室の記録を止めます"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
-msgstr "談話室は非匿名です"
+msgstr "談話室は非匿名になります"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
-msgstr "談話室は半匿名です"
+msgstr "談話室は半匿名になります"
 
-#: gajim/groupchat_control.py:1426
-#, fuzzy
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
-msgstr "談話室は完全匿名です"
+msgstr "談話室は完全匿名になります"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(jid)s は既にこの談話室に招待されています"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "談話室の会話は記録されています"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "新しい談話室が作成されました"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "サーバーはあなたの談話室ニックネームを割り当て (または変更し) ました"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s は蹴り出されました: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s は %(who)s によって蹴り出されました: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s は締め出されました: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s は %(who)s: によって締め出されました: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
-msgstr "あなたは %s と認識されました"
+msgstr "あなたは %s として認識されます"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s は退出しました (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "分掌を変更しました"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "談話室はメンバー制に変更されました"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "システムのシャットダウン"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** %(actor)s さんによって、%(nick)s さんの分掌は %(affiliation)s に設定されま"
 "した"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s さんの分掌は %(affiliation)s に設定されました"
 
 # (Mako)ここでの role は「役」
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 "** %(actor)s さんによって、%(nick)s さんの役は %(role)s に設定されました"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s さんの役は %(role)s に設定されました"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s さんが退出しました"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s さんが参加しました"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "本当にグループチャット \"%s\" から退出しますか ?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "このウィンドウを閉じると、このグループチャットから切断されます。"
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "%s を蹴り出し"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "下に理由を書けます:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "%s を締め出し"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+msgid "Jingle File Transfer"
+msgstr "Jingle ファイル転送"
+
+#: gajim/chat_control.py:331
+msgid "No File Transfer available"
+msgstr "ファイル転送は利用できません"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "書式の一覧を表示する"
 
-#: gajim/chat_control.py:371
-#, fuzzy
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
-msgstr "GPG が有効の場合、書式は利用できません。"
+msgstr "GPG が有効の場合、書式設定は利用できません。"
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
-msgstr "この相手先は HTML をサポートしていません。"
+msgstr "この相手先は HTML に対応していません。"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s の状態: %(state)s  理由: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s さん (グループチャット %(room_name)s より)"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "セッションの確立を中止しました"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "セッションはサーバーに記録されます"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "セッションはサーバーに記録されません"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "このセッションは暗号化されています"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " かつ、記録されます"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " かつ、記録されません"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2031,23 +2063,23 @@ msgstr ""
 "遠くの相手先の同一性は検証されませんでした。詳しくは盾ボタンをクリックしてく"
 "ださい。"
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "終端間暗号化 (E2EE) は無効"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" さんから新しいメッセージを受信しました"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "このタブを閉じると、記録を残さない設定の場合、このメッセージは失われます。"
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2056,7 +2088,7 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2065,105 +2097,106 @@ msgstr ""
 "%s さんからのメッセージを復号できません\n"
 "改竄の可能性があります。"
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s さんは現在、%(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 msgid "File transfer"
 msgstr "ファイルの転送"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr "サイズ"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr "承諾する (_A)"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "参加 (_J)"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "遠くの相手先が転送を中止しました"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "ファイルを開く際のエラー"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "統合アカウント"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "グループチャット"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "中継先"
 
-#: gajim/roster_window.py:2033
-#, fuzzy
+#: gajim/roster_window.py:2045
 msgid "Authorization sent"
 msgstr "承認が送信されました"
 
-#: gajim/roster_window.py:2034
-#, fuzzy, python-format
+#: gajim/roster_window.py:2046
+#, python-format
 msgid "\"%s\" will now see your status."
 msgstr "現在 \"%s\" さんはあなたの在席状況を知ることができます。"
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "在席通知の申し込みを送信しました"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "\"%s\" さんがこの申し込みを承認したら、相手先の在席状況を知ることができます。"
 
-#: gajim/roster_window.py:2072
-#, fuzzy
+#: gajim/roster_window.py:2084
 msgid "Authorization removed"
 msgstr "承認が取り消されました"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" さんは常にあなたをオフラインとして見ることになります。"
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr "OpenPGP は使用できません"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
 "Beware there is an incompatible python package called gnupg.\n"
 "You will be connected to %s without OpenPGP."
 msgstr ""
+"Gajim には python-gnupg (0.3.8 以上) が必要です。\n"
+"gnupg という python パッケージと互換性がないことに気をつけてください。\n"
+"OpenPGP なしに %s に接続されます。"
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "1つ以上のグループチャットに参加中です。"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2171,75 +2204,74 @@ msgstr ""
 "在席状況を「居ないふり」にすると、グループチャットから退出することになりま"
 "す。本当に「居ないふり」にしますか ?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "不揃い"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "本当に Gajim を終了しますか ?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "本当に Gajim を終了しますか ?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "常に Gajim を終了する"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "ファイルの転送を実行中です"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "いま終了すると、転送中のファイルは中断されます。それでも終了しますか?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "未読のメッセージがあります"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr ""
 "履歴が有効になっていて、かつ相手先が名簿にあれば、メッセージは後で読めます。"
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "この中継先を削除する前に、それらを読んでください。"
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "中継先 \"%s\" を削除します"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "もうこの中継先をとおして相手先にメッセージを送受信できません。"
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "中継先を削除します"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "もうこれらの中継先 %s をとおして相手先にメッセージを送受信できません。"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "相手先を遮断しようとしています。本当に続けますか ?"
 
-#: gajim/roster_window.py:2881
-#, fuzzy
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
@@ -2247,71 +2279,68 @@ msgstr ""
 "この相手先はあなたをオフラインと認識します。相手が送るメッセージは受信しませ"
 "ん。"
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "相手先の名前を変更"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "相手先 %s さんの新しいニックネームを入力してください"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "グループの名前変更"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "グループ %s の新しい名前を入力してください"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "グループの削除"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "名簿からグループ %s を削除しますか ?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "名簿のこのグループのすべての相手先も削除します"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP 鍵の割り当て"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "相手先に適用する鍵を選択してください"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "相手先 \"%s\" さんを名簿から削除します"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "\"%(name)s\" (%(jid)s) さんを名簿から削除しようとしています。\n"
 
-#: gajim/roster_window.py:3432
-#, fuzzy
+#: gajim/roster_window.py:3443
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
 "always seeing you as offline."
 msgstr ""
-"これらの相手先: %s\n"
-"を名簿から削除すると、在席通知の承認も取り消します。相手先はあなたを常にオフ"
-"ラインとして見ることになります。"
+"この相手先を名簿から削除すると、在席通知の承認も取り消します。相手先はあなた"
+"を常にオフラインとして見ることになります。"
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "続けますか ?"
 
-#: gajim/roster_window.py:3442
-#, fuzzy
+#: gajim/roster_window.py:3453
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in them always seeing you as offline."
@@ -2319,15 +2348,15 @@ msgstr ""
 "この相手先を名簿から削除すると、デフォルトで在席通知の承認も取り消します。相"
 "手先はあなたを常にオフラインとして見ることになります。"
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "削除後も、この相手先に自分の在席状況を知らせる"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "相手先は名簿から削除されました"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2337,53 +2366,52 @@ msgstr ""
 "を名簿から削除すると、在席通知の承認も取り消します。相手先はあなたを常にオフ"
 "ラインとして見ることになります。"
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "独自の在席状況を送信しようとしています。本当に続けますか ?"
 
-#: gajim/roster_window.py:3514
-#, fuzzy, python-format
+#: gajim/roster_window.py:3525
+#, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
-"この相手先は、一時的にあなたを %(status)s と見ることになります。それはあなた"
-"が在席状況を変更するまでの間です。その後はあなたの全体の在席状況を見ることに"
-"なります。"
+"この相手先は、一時的にあなたを %(status)s と見ることになります。しかしそれは"
+"あなたが在席状況を変更するまでの間です。その後はあなたの全体の在席状況を見る"
+"ことになります。"
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "アカウントがありません"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "相手先とチャットを開始する前に、アカウントを作成してください。"
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "「居ないふり」のあいだはグループチャットに参加できません"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
-msgstr "サーバーはメタ相手先の保存をサポートしていません"
+msgstr "サーバーはメタ相手先の保存に対応していません"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
-"サーバーはメタ相手先の情報の保存をサポートしていません。したがってその情報は"
-"次の接続の際には失われています。"
+"サーバーはメタ相手先の情報の保存に対応していません。したがってその情報は次の"
+"接続の際には失われています。"
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "メタ相手先を作成しようとしています。本当に続けますか ?"
 
-#: gajim/roster_window.py:4267
-#, fuzzy
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
@@ -2392,193 +2420,187 @@ msgstr ""
 "人物が複数の Jabber アカウントや中継先アカウントを持っているときに使用しま"
 "す。"
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "ファイルの URI が正しくありません:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "このファイルを %s さんに転送しますか:"
 msgstr[1] "これらのファイルを %s さんに転送しますか:"
 
-#: gajim/roster_window.py:4540
-#, fuzzy, python-format
+#: gajim/roster_window.py:4552
+#, python-format
 msgid "Send %(from)s to %(to)s"
-msgstr "%s を %s に送信"
+msgstr "%(from)s を %(to)s に送信"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s を優先の相手先とする"
 
 # (Mako) よくわからない。Make [c_source.get_shown_name()] and [c_dest.get_shown_name()] metacontacts
-#: gajim/roster_window.py:4558
-#, fuzzy, python-format
+#: gajim/roster_window.py:4570
+#, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
-msgstr "%s と %s をメタ相手先とする"
+msgstr "%(contact1)s と %(contact2)s をメタ相手先とする"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "状況メッセージの変更 (_C)"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "聴いている楽曲名を公開"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "位置情報を公開"
 
-#: gajim/roster_window.py:4989
-#, fuzzy
+#: gajim/roster_window.py:4997
 msgid "Configure Services…"
-msgstr "サービスの調整..."
+msgstr "サービスの調整…"
 
 # (Mako)ここでは「復元」の意味か
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "ウィンドウをすべて復元 (_M)"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "メッセージの一斉送信 (_E)"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "すべてのユーザーに"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "オンラインのすべてのユーザーに"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "招待 (_V)"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "相手先の管理 (_M)"
 
-#: gajim/roster_window.py:5313
-#, fuzzy
+#: gajim/roster_window.py:5321
 msgid "Edit _Groups…"
-msgstr "グループの編集"
+msgstr "グループの編集…(_G)"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "削除 (_R)"
 
 # (Mako)ここでは「復元」の意味か
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "ウィンドウの復元 (_M)"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "再接続 (_R)"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "切断 (_D)"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "履歴 (_H)"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "履歴マネージャ"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "新しいグループチャットに参加 (_J)"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "状況メッセージの変更 (_C)"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 msgid "Show the application's version"
 msgstr "アプリケーションのバージョンを表示"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 msgid "Show only critical errors"
 msgstr "深刻なエラーのみ表示"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
-msgstr ""
+msgstr "プロフィールのファイルを完全に分離する(履歴データベースやプラグインも)"
 
-#: gajim/gajim.py:78
-#, fuzzy
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr "XML スタンザとその他のデバッグ情報を出力"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 msgid "Use defined profile in configuration directory"
 msgstr "設定ディレクトリ内の設定ファイルを指定"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 msgid "Set configuration directory"
 msgstr "設定ファイルのディレクトリを指定"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr "ログシステムを設定"
 
-#: gajim/gajim.py:92
-#, fuzzy
+#: gajim/gajim.py:96
 msgid "Show all warnings"
-msgstr "すべての保留イベントの表示 (_E)"
+msgstr "すべての警告を表示"
+
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr "ipython のシェルを開く"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "データベースのエラー"
 
-#: gajim/history_sync.py:220
-#, fuzzy
+#: gajim/history_sync.py:217
 msgid "How far back do you want to go?"
-msgstr "何をしたいですか ?"
+msgstr "どのくらい遡りたいですか ?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
-msgstr ""
+msgstr "1か月"
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
-msgstr ""
+msgstr "3か月"
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
-msgstr ""
+msgstr "1年"
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
-msgstr ""
+msgstr "すべての期間"
 
-#: gajim/history_sync.py:257
-#, fuzzy
+#: gajim/history_sync.py:254
 msgid "Connecting..."
-msgstr "接続中です"
+msgstr "接続中です..."
 
-#: gajim/history_sync.py:269
-#, fuzzy, python-format
+#: gajim/history_sync.py:266
+#, python-format
 msgid "%(received)s of %(max)s"
-msgstr "%(name)s さんからのファイル %(filename)s の転送に失敗しました。"
+msgstr "%(max)s のうち %(received)s"
 
-#: gajim/history_sync.py:273
-#, fuzzy, python-format
+#: gajim/history_sync.py:270
+#, python-format
 msgid "Downloaded %s Messages"
-msgstr "未読メッセージの転送"
+msgstr "%s件のメッセージをダウンロードしました"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2586,22 +2608,34 @@ msgid ""
 "        {received} Messages downloaded.\n"
 "        "
 msgstr ""
+"\n"
+"        履歴の同期が完了しました。\n"
+"        {received}件のメッセージをダウンロードしました。\n"
+"        "
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
 "        with the Archive.\n"
 "        "
 msgstr ""
+"\n"
+"        Gajim は保存記録と\n"
+"        完全に同期しました。\n"
+"        "
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
 "        progress. Please try later.\n"
 "        "
 msgstr ""
+"\n"
+"        ただいま同期の作業中です。\n"
+"        後で試してください。\n"
+"        "
 
 #: gajim/config.py:156 gajim/config.py:626
 #: gajim/data/gui/preferences_window.ui:68
@@ -2660,9 +2694,8 @@ msgid "Role"
 msgstr "役"
 
 #: gajim/config.py:1680
-#, fuzzy
 msgid "Banning…"
-msgstr "締め出し中..."
+msgstr "締め出し中…"
 
 #: gajim/config.py:1682
 msgid ""
@@ -2673,9 +2706,8 @@ msgstr ""
 "\n"
 
 #: gajim/config.py:1684
-#, fuzzy
 msgid "Adding Member…"
-msgstr "メンバーを追加..."
+msgstr "メンバーを追加…"
 
 #: gajim/config.py:1685
 msgid ""
@@ -2686,9 +2718,8 @@ msgstr ""
 "\n"
 
 #: gajim/config.py:1687
-#, fuzzy
 msgid "Adding Owner…"
-msgstr "主宰者を追加..."
+msgstr "主宰者を追加…"
 
 #: gajim/config.py:1688
 msgid ""
@@ -2699,9 +2730,8 @@ msgstr ""
 "\n"
 
 #: gajim/config.py:1690
-#, fuzzy
 msgid "Adding Administrator…"
-msgstr "管理人を追加..."
+msgstr "管理人を追加…"
 
 #: gajim/config.py:1691
 msgid ""
@@ -2740,16 +2770,16 @@ msgstr "アカウントは無効です"
 msgid "To unregister from a server, account must be enabled."
 msgstr "サーバーから登録を解除するには、アカウントを有効にしてください。"
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "パスワードが必要です"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s のパスワードを入力してください"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "パスワードを保存する"
 
@@ -2779,10 +2809,18 @@ msgstr "アカウントを Gajim からのみ削除"
 msgid "Don't remove anything. I'll try again later"
 msgstr "何も削除できません。あとで試みます"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "すべて"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "入退室のみ"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "なし"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "新しいグループチャット"
@@ -2847,11 +2885,11 @@ msgstr "入力内容が正しくありません"
 msgid "Custom port must be a port number."
 msgstr "ポートは番号で指定してください。"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "証明書はファイルにあります"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "この証明書は既にファイル %s にあります。再び追加しません。"
@@ -2872,7 +2910,7 @@ msgstr ""
 "それでもこのサーバーに接続しますか ?"
 
 #: gajim/config.py:2636
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA-1 fingerprint of the certificate:\n"
@@ -2881,10 +2919,10 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 "この証明書を、信頼できる証明書の一覧に追加します。\n"
-"この証明書の SHA1 指紋:\n"
-"%s\n"
-"この証明書の SHA256 指紋:\n"
-"%s"
+"この証明書の SHA-1 指紋:\n"
+"%(sha1)s\n"
+"この証明書の SHA-256 指紋:\n"
+"%(sha256)s"
 
 #: gajim/config.py:2670 gajim/config.py:2704
 msgid "An error occurred during account creation"
@@ -2956,91 +2994,111 @@ msgstr "グループチャットのメッセージの強調"
 msgid "Group Chat Message Received"
 msgstr "グループチャットのメッセージを受信した"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "このグループチャットの %(owner_or_admin_or_member)s "
 
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "なし"
+
 # (Mako)「会員」では排他的なニュアンスが強いのでしかたなくカタカナ語で
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "メンバー"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "管理人"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "主宰者"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [遮断しています]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [最小化しています]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "接続中"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "切断中"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+msgid "?Noun:Download"
+msgstr "ダウンロード"
+
+#: gajim/tooltips.py:653
+msgid "?Noun:Upload"
+msgstr "アップロード"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "種類: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "転送: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "開始していません"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "停止しています"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "完了しました"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "一時停止しました"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "滞っています"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "転送しています"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "在席状況: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "在席"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "チャット可"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "離席中"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "取り込み中"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "不在"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "オフライン"
 
@@ -3089,126 +3147,128 @@ msgstr "(なし)"
 msgid "Hidden"
 msgstr "(非表示)"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr "コンピューターを終了しています"
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr "ネットワークから切断"
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "%s さんとの会話の履歴"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "会話の履歴"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "ディスクのエラー"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s さんは現在、%(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "エラー: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "エラー"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "現在の状況: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "現在の状況: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "件名: %s\n"
 
-#: gajim/statusicon.py:233
-#, fuzzy
+#: gajim/statusicon.py:215
 msgid "_Change Status Message…"
-msgstr "状況メッセージの変更 (_C)"
+msgstr "状況メッセージを変更…(_C)"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "アカウント %s で"
 
-#: gajim/statusicon.py:333
-#, fuzzy
+#: gajim/statusicon.py:315
 msgid "_Manage Bookmarks…"
-msgstr "ブックマークを管理"
+msgstr "ブックマークを管理…(_M)"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "名簿を閉じる (_R)"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "名簿を表示 (_R)"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "このメニューを表示しない"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "画像をロードできません"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "メディアタイプはサポートされていません: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "この欄は必須項目です"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
-msgstr ""
+msgid "%(days)s days, %(hours)s hours"
+msgstr "%(days)s日%(hours)s時間"
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
-#, fuzzy
 msgid "Hostname"
-msgstr "ホスト名 (_H):"
+msgstr "ホスト名"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
-msgstr ""
+msgstr "サーバーソフトウェア"
 
-#: gajim/server_info.py:188
-#, fuzzy
+#: gajim/server_info.py:189
 msgid "Server Uptime"
-msgstr "サーバーの応答: %s"
+msgstr "サーバーの稼働時間"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
 msgstr ""
+"\n"
+"設定で無効化されています"
 
 #: gajim/disco.py:69
 msgid "This service has not yet responded with detailed information"
@@ -3360,7 +3420,7 @@ msgstr "継読 (_S)"
 msgid "_Unsubscribe"
 msgstr "継読の取り消し (_U)"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3368,51 +3428,59 @@ msgstr ""
 "この線より下の文は、このグループチャットを\n"
 "最後に読んだとき以降に発生したものです"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "引用 (_Q)"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\" に対する操作 (_A)"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia の項を読む (_W)"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "辞書を引く (_D)"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "辞書の URL に \"%s\" が含まれていません。また、WIKTIONARY でもありません"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "ウェブ検索の URL に \"%s\" が含まれていません"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "ウェブで検索する (_S)"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "リンクとして開く (_L)"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr "URL:"
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 msgid "Invalid URL"
 msgstr "URL が正しくありません"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+"<b>メッセージは修正されました。元のメッセージは</b>\n"
+"{}"
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3420,34 +3488,37 @@ msgstr[0] "昨日"
 msgstr[1] "%(nb_days)i日前"
 
 #: gajim/message_textview.py:43
-#, fuzzy
 msgid "Write a message.."
-msgstr "状況メッセージ"
+msgstr "メッセージを書いてください.."
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "タブを閉じようとしています"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "本当にそれらをすべて閉じますか ?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+msgid "?Noun:Chats"
+msgstr "チャット"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "個人チャット"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "メッセージ"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "グループに参加できません"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3460,142 +3531,139 @@ msgstr ""
 "で、ご希望のニックネームは既に他の在室者に使われています。\n"
 "別のニックネームを下に入力してください:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "衝突が生じたときはいつもこのニックネームを使う"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "この申し込みを承認しますか ?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "アカウント %s への申し込みを承認しますか ?"
 
-#: gajim/gui_interface.py:186
-#, fuzzy, python-format
+#: gajim/gui_interface.py:185
+#, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
-msgstr "%(url)s に対する HTTP (%(method)s) の承認 (id: %(id)s)"
+msgstr "%(url)s に対する HTTP (%(method)s) の承認 (ID: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "接続に失敗しました"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "談話室 %s に参加するにはパスワードが必要です。入力してください。"
 
-#: gajim/gui_interface.py:331
-#, fuzzy, python-format
+#: gajim/gui_interface.py:330
+#, python-format
 msgid "<b>%s</b> is full"
-msgstr "<b>3</b> def"
+msgstr "<b>%s</b> は満室です"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "グループチャット <b>%s</b> から締め出されています。"
 
-#: gajim/gui_interface.py:347
-#, fuzzy, python-format
+#: gajim/gui_interface.py:346
+#, python-format
 msgid "Remote server <b>%s</b> does not exist."
-msgstr "グループチャット <b>%s</b> は存在しません。"
+msgstr "リモートサーバー <b>%s</b> は存在しません。"
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "グループチャット <b>%s</b> は存在しません。"
 
-#: gajim/gui_interface.py:354
-#, fuzzy
+#: gajim/gui_interface.py:353
 msgid "Group chat creation is not permitted."
 msgstr "グループチャットの作成は制限されています。"
 
-#: gajim/gui_interface.py:356
-#, fuzzy
+#: gajim/gui_interface.py:355
 msgid "Unable to join groupchat"
 msgstr "グループに参加できません"
 
-#: gajim/gui_interface.py:357
-#, fuzzy, python-format
+#: gajim/gui_interface.py:356
+#, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "登録したニックネームは、グループチャット <b>%s</b> で使われます。"
+msgstr "<b>%s</b> では登録したニックネームを使う必要があります。"
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "あなたはグループチャット %s のメンバー一覧にありません。"
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "エラー %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s を送信する際にエラー ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "在席通知申込"
 
 # (Mako)承認なしに名簿にある状態
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "オブザーバー"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "承認が得られました"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "相手先 %s さんは、あなたが在席状況を見ることを承認しました。"
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "相手先 \"%s\" さんは、あなたからの申し込みを削除しました。"
 
-#: gajim/gui_interface.py:549
-#, fuzzy
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
-"この相手先を常にオフラインとして見ることになります。\n"
+"これらの相手先を常にオフラインとして見ることになります。\n"
 "相手先一覧から削除しますか ?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "在席通知の取り消し"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" との接続は確立できません"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "設定を確認するか、あとで試してください。"
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s は招待を断りました: %(reason)s"
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s は招待を断りました。"
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
@@ -3603,35 +3671,32 @@ msgstr ""
 "Gajim は OpenPGP エージェントを使用するよう設定されました。しかし、OpenPGP "
 "エージェントが起動していないか、あるいはパスフレーズが間違っています。\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "現在、OpenPGP 鍵を使わずに接続しています。"
 
-#: gajim/gui_interface.py:681
-#, fuzzy
+#: gajim/gui_interface.py:680
 msgid "Wrong passphrase"
 msgstr "パスフレーズが間違っています"
 
-#: gajim/gui_interface.py:686
-#, fuzzy
+#: gajim/gui_interface.py:685
 msgid "Wrong OpenPGP passphrase"
-msgstr "パスフレーズが間違っています"
+msgstr "OpenPGP のパスフレーズが間違っています"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 msgid "Certificate Passphrase Required"
 msgstr "証明書のパスフレーズが必要です"
 
-#: gajim/gui_interface.py:701
-#, fuzzy, python-format
+#: gajim/gui_interface.py:700
+#, python-format
 msgid "Enter the certificate passphrase for account %s"
-msgstr "アカウント %s の証明書のパスフレーズを入力してください。"
+msgstr "アカウント %s の証明書のパスフレーズを入力してください"
 
-#: gajim/gui_interface.py:724
-#, fuzzy
+#: gajim/gui_interface.py:723
 msgid "Untrusted OpenPGP key"
-msgstr "OpenPGP の鍵を選択してください"
+msgstr "信用のない OpenPGP 鍵"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
@@ -3639,76 +3704,80 @@ msgstr ""
 "このチャットの暗号化に使った OpenPGP 鍵には信用がありません。本当にこのメッ"
 "セージを暗号化しますか ?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr "表示された web サイトから新しいトークンをコピー/ペーストしてください。"
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr "Oauth2 信任状"
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s さんがファイルを転送したがっています。"
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL 証明書エラー"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 msgid "File Transfer Failed"
 msgstr "ファイル転送に失敗しました"
 
-#: gajim/gui_interface.py:1061
-#, fuzzy, python-format
+#: gajim/gui_interface.py:1060
+#, python-format
 msgid "%(filename)s received from %(name)s."
-msgstr "%(name)s さんからのファイル %(filename)s の転送に失敗しました。"
+msgstr "%(name)s さんからのファイル %(filename)s を受け取りました。"
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s さんからのファイル %(filename)s の転送を中断しました。"
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "%(name)s さんからのファイル %(filename)s の転送に失敗しました。"
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s さんへファイル %(filename)s を送りました。"
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(name)s さんへのファイル %(filename)s の転送を中断しました。"
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "%(name)s さんへのファイル %(filename)s の転送に失敗しました。"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+msgid "Choose file to send"
+msgstr "送信するファイルを選択"
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "メッセージを復号できません"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "ユーザー名の重複"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "ローカルのアカウントの新しいユーザー名を入力してください"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "リソースの衝突"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3716,31 +3785,31 @@ msgstr ""
 "このアカウントの同じリソースですでに接続しています。新しいアカウントを入力し"
 "てください"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s さんがファイルを音声チャットを始めたがっています。"
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "音声チャットの要求"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "SSL 証明書の検証エラー"
 
-#: gajim/gui_interface.py:1343
-#, fuzzy, python-format
+#: gajim/gui_interface.py:1384
+#, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
 "%(error)s\n"
 "Do you still want to connect to this server?"
 msgstr ""
-"jabber サーバーの SSL 証明書の検証にエラーがあります: %(error)s\n"
+"XMPP サーバーの SSL 証明書の検証にエラーがあります: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: gajim/gui_interface.py:1347
-#, fuzzy, python-format
+#: gajim/gui_interface.py:1388
+#, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA-1 fingerprint of the certificate:\n"
@@ -3748,22 +3817,22 @@ msgid ""
 "SHA256 fingerprint of the certificate:\n"
 "%(sha256)s"
 msgstr ""
-"この証明書を、信頼できる証明書の一覧に追加します。\n"
-"この証明書の SHA1 指紋:\n"
-"%s\n"
-"この証明書の SHA256 指紋:\n"
-"%s"
+"この証明書を、信用する証明書の一覧に追加します。\n"
+"この証明書の SHA-1 指紋:\n"
+"%(sha1)s\n"
+"この証明書の SHA-256 指紋:\n"
+"%(sha256)s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "この証明書のこのエラーを無視します。"
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr "非匿名サーバー"
 
-#: gajim/gui_interface.py:1390
-#, fuzzy, python-format
+#: gajim/gui_interface.py:1431
+#, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
 "valid or your connection is being compromised.\n"
@@ -3778,6 +3847,7 @@ msgid ""
 msgstr ""
 "アカウント %(account)s の SSL 証明書が変更され、それが正しくないか、あるいは"
 "接続が乗っ取られています。\n"
+"\n"
 "古い SHA-1 指紋: %(old_sha1)s\n"
 "古い SHA-256 指紋: %(old_sha256)s\n"
 "\n"
@@ -3786,7 +3856,7 @@ msgstr ""
 "\n"
 "それでも接続して、証明書の指紋を更新しますか ?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3794,7 +3864,7 @@ msgstr ""
 "安全でない接続でパスワードを送ろうとしています。それを避けるには PyOpenSSL を"
 "インストールする必要があります。それでも続けますか ?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3802,16 +3872,15 @@ msgstr ""
 "安全でない接続で暗号化されていないパスワードを送ろうとしています。それでも続"
 "けますか ?"
 
-#: gajim/gui_interface.py:1807
-#, fuzzy
+#: gajim/gui_interface.py:1848
 msgid "JID is not a Groupchat"
-msgstr "グループチャットではありません"
+msgstr "JID はグループチャットではありません"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "感情アイコンは無効"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3819,63 +3888,65 @@ msgstr ""
 "指定された感情アイコンのテーマは見つかりません。そのため、感情アイコンは無効"
 "です。"
 
-#: gajim/gui_interface.py:1973
-#, fuzzy
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
-"指定された感情アイコンのテーマは見つかりません。そのため、感情アイコンは無効"
-"です。"
+"指定された感情アイコンのテーマを読み込めませんでした。詳細はログを参照してく"
+"ださい。"
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "グループチャットではありません"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
 "correct group chat name. If it is, delete it from your roster and try "
 "joining the group chat again."
 msgstr ""
+"%(room_jid)s は既に名簿にあります。%(room_jid)s が正しいグループチャット名か"
+"どうか確認してください。もし正しければ、それを名簿から削除して、もう一度その"
+"グループチャットに参加してみてください。"
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "設定を保存できませんでした"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "デフォルト"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "パスフレーズが必要です"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "鍵ID %(keyid)s (アカウント %(account)s) の OpenPGP 鍵のパスフレーズを入力して"
 "ください。"
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 msgid "OpenPGP key expired"
 msgstr "OpenPGP 鍵は期限切れです"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "OpenPGP 鍵は有効期限が切れています。OpenPGP なしに %s に接続します。"
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "パスフレーズが間違っています"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "OpenPGP のパスフレーズをもういちど入力するか、または「中止」を押してくださ"
@@ -3946,10 +4017,13 @@ msgstr "- メッセージは記録されます"
 msgid "- messages will not be logged"
 msgstr "- メッセージは記録されません"
 
+#: gajim/notify.py:103
+msgid "Open"
+msgstr "開く"
+
 #: gajim/dialog_messages.py:33
-#, fuzzy
 msgid "You can not start a new conversation unless you are connected."
-msgstr "接続しないと、グループチャットに参加できません。"
+msgstr "接続しないと、新しい会話を開始できません。"
 
 #: gajim/dialog_messages.py:48
 msgid "Unread events"
@@ -3975,7 +4049,7 @@ msgstr "フォームが正しくありません"
 msgid "The form is not filled correctly."
 msgstr "フォームが正しく入力されていません。"
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "居ないふり"
 
@@ -3988,16 +4062,12 @@ msgid "Your message can not be sent until you are connected."
 msgstr "接続するまでメッセージは送信されません。"
 
 #: gajim/dialog_messages.py:73
-#, fuzzy
 msgid "JID already in list"
-msgstr "Jabber ID は一覧にあります"
+msgstr "JID は一覧にあります"
 
 #: gajim/dialog_messages.py:74
-#, fuzzy
 msgid "The JID you entered is already in the list. Choose another one."
-msgstr ""
-"入力された Jabber ID は既に一覧に載っています。別の Jabber ID を選択してくだ"
-"さい。"
+msgstr "入力された JID は既に一覧に載っています。別の JID を選択してください。"
 
 #: gajim/dialog_messages.py:78
 msgid "Invalid answer"
@@ -4013,9 +4083,9 @@ msgid "Wrong Custom Hostname"
 msgstr "カスタムホスト名が正しくありません"
 
 #: gajim/dialog_messages.py:85
-#, fuzzy, python-format
+#, python-format
 msgid "Wrong custom hostname \"%s\". Ignoring it."
-msgstr "カスタムホスト名が正しくありません"
+msgstr "カスタムホスト名 \"%s\" が正しくありません。これを無視します。"
 
 #: gajim/dialog_messages.py:89
 msgid "Error while removing privacy list"
@@ -4037,7 +4107,7 @@ msgstr "「居ないふり」はサポートされていません"
 #: gajim/dialog_messages.py:97
 #, python-format
 msgid "Account %s doesn't support invisibility."
-msgstr "アカウント %s は「居ないふり」をサポートしていません。"
+msgstr "アカウント %s は「居ないふり」に対応していません。"
 
 #: gajim/dialog_messages.py:101
 msgid "Unregister failed"
@@ -4059,7 +4129,7 @@ msgstr "エージェント %s の登録は成功しました"
 
 #: gajim/dialog_messages.py:111
 msgid "Registration failed"
-msgstr "登録が失敗しました"
+msgstr "登録に失敗しました"
 
 #: gajim/dialog_messages.py:112
 #, python-format
@@ -4068,31 +4138,29 @@ msgid ""
 msgstr "%(agent)s の登録は失敗しました。%(error)s: %(error_msg)s"
 
 #: gajim/dialog_messages.py:117
-#, fuzzy
 msgid "Unable to join Groupchat"
-msgstr "グループに参加できません"
+msgstr "グループチャットに参加できません"
 
 #: gajim/dialog_messages.py:122
 msgid "GStreamer error"
 msgstr "GStreamer エラー"
 
 #: gajim/dialog_messages.py:123
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
 msgstr ""
-"エラー: %s\n"
-"デバッグ: %s"
+"エラー: %(error)s\n"
+"デバッグ: %(debug)s"
 
 #: gajim/dialog_messages.py:127
-#, fuzzy
 msgid "Wrong host"
-msgstr "サーバーが正しくありません"
+msgstr "ホストが正しくありません"
 
 #: gajim/dialog_messages.py:128
 msgid "Invalid local address? :-O"
-msgstr ""
+msgstr "ローカルアドレスが正しくありません"
 
 #: gajim/dialog_messages.py:132
 msgid "Avahi error"
@@ -4107,6 +4175,54 @@ msgstr ""
 "%s\n"
 "ローカルの伝送がうまく働いていないようです。"
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "ローカルのサービスを起動できませんでした"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr "サーバーから予期しない応答がありました (ログを参照してください)"
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+msgid "Could not open file"
+msgstr "ファイルを開けませんでした"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "サービスはエラーを返しました。"
+
+#: gajim/dialog_messages.py:162
+msgid "Could not upload file"
+msgstr "ファイルをアップロードできませんでした"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr "サーバーからのHTTP応答コード: %s"
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr "アップロードエラー"
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr "暗号化のエラー"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "接続は有効ではありません"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "テーマ"
@@ -4116,9 +4232,8 @@ msgid "You cannot make changes to the default theme"
 msgstr "デフォルトテーマは変更できません。"
 
 #: gajim/gajim_themes_window.py:99
-#, fuzzy
 msgid "Please create a new clean theme."
-msgstr "名前をつけて、新しいテーマを作成してください。"
+msgstr "新しいテーマを作成してください。"
 
 #: gajim/gajim_themes_window.py:170
 msgid "theme name"
@@ -4130,9 +4245,17 @@ msgstr "現在のテーマは削除できません"
 
 #: gajim/gajim_themes_window.py:188
 msgid "Pick another theme to use first."
-msgstr ""
+msgstr "最初に使う別のテーマを選ぶ"
+
+#: gajim/accounts_window.py:40
+msgid "Merge Accounts"
+msgstr "アカウントを統合"
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr "PGP エージェントを使う"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "すぐ戻ります。"
 
@@ -4153,57 +4276,53 @@ msgstr "アカウント %s でチャット中です"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "すべてのチャットとグループチャットのウィンドウを閉じます。続けますか ?"
 
+#: gajim/accounts_window.py:344
+msgid "Remove"
+msgstr "削除"
+
 #: gajim/accounts_window.py:387
-#, fuzzy
 msgid "Rename account label"
-msgstr "アカウントの変更"
+msgstr "アカウントのラベルを変更"
 
 #: gajim/accounts_window.py:456
 msgid "Login"
-msgstr ""
+msgstr "ログイン"
 
 #: gajim/accounts_window.py:465
 msgid "Connection"
 msgstr "接続"
 
 #: gajim/accounts_window.py:468
-#, fuzzy
 msgid "Import Contacts"
-msgstr "相手先を招待 (_C)"
+msgstr "相手先をインポート"
 
 #: gajim/accounts_window.py:471 gajim/accounts_window.py:654
-#, fuzzy
 msgid "Client Certificate"
 msgstr "クライアント証明書"
 
 #: gajim/accounts_window.py:474 gajim/accounts_window.py:569
-#, fuzzy
 msgid "OpenPGP Key"
-msgstr "OpenPGP 鍵の割り当て"
+msgstr "OpenPGP 鍵"
 
 #: gajim/accounts_window.py:485 gajim/accounts_window.py:557
-#, fuzzy
 msgid "Connect on startup"
-msgstr "Gajim 起動時に接続する (_O)"
+msgstr "起動時に接続する"
 
 #: gajim/accounts_window.py:488
-#, fuzzy
 msgid "Reconnect when connection is lost"
 msgstr "切断したら自動で再接続する"
 
 #: gajim/accounts_window.py:491 gajim/accounts_window.py:561
-#, fuzzy
 msgid "Save conversations for all contacts"
-msgstr "すべての相手先の会話記録を保存する (_L)"
+msgstr "すべての相手先の会話記録を保存する"
 
 #: gajim/accounts_window.py:493 gajim/accounts_window.py:563
 msgid "Store conversations on the harddrive"
-msgstr ""
+msgstr "ハードドライブに会話を保存"
 
 #: gajim/accounts_window.py:495
-#, fuzzy
 msgid "Server Message Archive"
-msgstr "サーバーメッセージを送信...(_S)"
+msgstr "サーバーでのメッセージ保存"
 
 #: gajim/accounts_window.py:497
 msgid ""
@@ -4212,21 +4331,22 @@ msgid ""
 "between multiple devices.\n"
 "XEP-0313"
 msgstr ""
+"メッセージをサーバーで保存します。\n"
+"保存は複数のデバイスでの同期に\n"
+"使用されます。\n"
+"XEP-0313"
 
 #: gajim/accounts_window.py:502 gajim/accounts_window.py:565
-#, fuzzy
 msgid "Global Status"
-msgstr "在席状況"
+msgstr "全体の在席状況"
 
 #: gajim/accounts_window.py:504
-#, fuzzy
 msgid "Synchronise the status of all accounts"
-msgstr "アカウントの在席状況の変更します"
+msgstr "すべてのアカウントの在席状況を同期します"
 
 #: gajim/accounts_window.py:506
-#, fuzzy
 msgid "Message Carbons"
-msgstr "メッセージ"
+msgstr "メッセージ複写"
 
 #: gajim/accounts_window.py:508
 msgid ""
@@ -4234,60 +4354,54 @@ msgid ""
 "of sent and received messages.\n"
 "XEP-0280"
 msgstr ""
+"送受信するメッセージのコピーを、自分の別の\n"
+"オンラインのデバイスすべてで受け取ります。\n"
+"XEP-0280"
 
 #: gajim/accounts_window.py:512
 msgid "Use file transfer proxies"
 msgstr "ファイル転送のプロキシを使う"
 
 #: gajim/accounts_window.py:524 gajim/accounts_window.py:559
-#, fuzzy
 msgid "Use environment variable"
-msgstr "環境変数 HTTP__PROXY を使う (_U)"
+msgstr "環境変数を使う"
 
 #: gajim/accounts_window.py:526
-#, fuzzy
 msgid "Proxy"
-msgstr "プロキシ (_Y):"
+msgstr "プロキシ"
 
 #: gajim/accounts_window.py:529
-#, fuzzy
 msgid "Warn on insecure connection"
-msgstr "安全でない接続の前には警告する (_W)"
+msgstr "安全でない接続の前には警告する"
 
 #: gajim/accounts_window.py:533
-#, fuzzy
 msgid "Send keep-alive packets"
-msgstr "生存パケットを送信する (_K)"
+msgstr "生存パケットを送信する"
 
 #: gajim/accounts_window.py:537
 msgid "Manually set the hostname for the server"
-msgstr ""
+msgstr "サーバーのホスト名を手動で設定する"
 
 #: gajim/accounts_window.py:540
-#, fuzzy
 msgid "Resource"
-msgstr "リソース:"
+msgstr "リソース"
 
 #: gajim/accounts_window.py:543 gajim/accounts_window.py:611
 #: gajim/accounts_window.py:616
-#, fuzzy
 msgid "Priority"
-msgstr "優先順位 (_T):"
+msgstr "優先順位"
 
 #: gajim/accounts_window.py:567
-#, fuzzy
 msgid "Synchronize the status of all accounts"
-msgstr "アカウントの在席状況の変更します"
+msgstr "すべてのアカウントの在席状況を同期します"
 
 #: gajim/accounts_window.py:580
-#, fuzzy
 msgid "First Name"
-msgstr "名:"
+msgstr "名"
 
 #: gajim/accounts_window.py:583
-#, fuzzy
 msgid "Last Name"
-msgstr "姓:"
+msgstr "姓"
 
 #: gajim/accounts_window.py:586
 #: gajim/data/gui/archiving_313_preferences_window.ui:71
@@ -4295,118 +4409,121 @@ msgid "Jabber ID"
 msgstr "Jabber ID"
 
 #: gajim/accounts_window.py:589
-#, fuzzy
 msgid "Email"
-msgstr "新着メール"
+msgstr "メール"
 
 #: gajim/accounts_window.py:607
-#, fuzzy
 msgid "Adjust to status"
-msgstr "在席状況に合わせる (_D)"
+msgstr "在席状況に合わせる"
 
 #: gajim/accounts_window.py:634
-#, fuzzy
 msgid "Enable"
 msgstr "有効"
 
 #: gajim/accounts_window.py:641
-#, fuzzy
 msgid "Port"
-msgstr "ポート番号 (_P):"
+msgstr "ポート番号"
 
 #: gajim/accounts_window.py:646
-#, fuzzy
 msgid "Connection Options"
-msgstr "接続"
+msgstr "接続オプション"
 
 #: gajim/accounts_window.py:658
-#, fuzzy
 msgid "Encrypted Certificate"
-msgstr "クライアント証明書"
+msgstr "暗号化された証明書"
 
 #: gajim/accounts_window.py:662
-#, fuzzy
 msgid "Certificate Options"
-msgstr "通知"
+msgstr "証明書オプション"
 
 #: gajim/accounts_window.py:670 gajim/data/gui/join_groupchat_window.ui:143
-#, fuzzy
 msgid "Password"
-msgstr "パスワード:"
+msgstr "パスワード"
 
 #: gajim/accounts_window.py:674
-#, fuzzy
 msgid "Save Password"
-msgstr "パスワードを保存する"
+msgstr "パスワードを保存"
 
 #: gajim/accounts_window.py:677 gajim/data/gui/change_password_dialog.ui:8
 msgid "Change Password"
-msgstr "パスワードの変更"
+msgstr "パスワードを変更"
 
 #: gajim/accounts_window.py:682
-#, fuzzy
 msgid "Login Options"
-msgstr "オプション:"
+msgstr "ログインオプション"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "このコンピューターに D-Bus がないか、あるいは python のモジュールがありません"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "指定のコマンドに対するヘルプを表示します"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "コマンド"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "コマンドのヘルプを表示します"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "名簿ウィンドウの表示/非表示"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "次の保留イベントをポップアップウィンドウに表示します"
 
-#: gajim/gajim_remote.py:96
-#, fuzzy
+#: gajim/gajim_remote.py:97
 msgid "Lists all contacts in roster, one for each line"
-msgstr ""
-"名簿にある相手先をすべて表示します。それぞれの相手先は空行で区切られます"
+msgstr "名簿にある相手先すべてを、それぞれ1行に表示します"
+
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+msgid "?CLI:account"
+msgstr "?CLI:アカウント"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "指定されたアカウントの相手先のみ表示します"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "登録アカウントの一覧の表示します"
 
-#: gajim/gajim_remote.py:108
-#, fuzzy
+#: gajim/gajim_remote.py:109
 msgid "Changes the status of account(s)"
 msgstr "アカウントの在席状況の変更します"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+msgid "?CLI:status"
+msgstr "?CLI:在席状況"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr ""
-"次のいずれか: offline (オフライン)、online (オンライン)、chat (チャット"
-"可)、\n"
-"away (離席中)、xa (不在)、dnd (取り込み中)、invisible (居ないふり)。\n"
-"設定されなければ、アカウントの以前の状況が使われます"
+"次のいずれか: offline (オフライン)、online (オンライン)、chat (チャット可)、"
+"away (離席中)、xa (不在)、dnd (取り込み中)、invisible (居ないふり)。設定され"
+"なければ、アカウントの以前の状況が使われます"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+msgid "?CLI:message"
+msgstr "?CLI:メッセージ"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "状況メッセージ"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4415,16 +4532,19 @@ msgstr ""
 "合、\"sync with global status\" オプションが設定されているアカウントすべての"
 "在席状況を変更します。"
 
-#: gajim/gajim_remote.py:119
-#, fuzzy
+#: gajim/gajim_remote.py:120
 msgid "Changes the priority of account(s)"
 msgstr "アカウントの優先順位を変更します"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+msgid "?CLI:priority"
+msgstr "?CLI:優先順位"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "アカウントに設定する優先順位"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4432,7 +4552,7 @@ msgstr ""
 "アカウントの優先順位を変更します。アカウントが指定されない場合、\"sync with "
 "global status\" オプションの設定されたアカウントすべての優先順位を変更します"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4442,157 +4562,154 @@ msgstr ""
 "らも指定しなくてもかまいません。 'アカウント'(account) だけを設定して "
 "'OpenPGP 鍵' を設定したくない場合、'OpenPGP 鍵' は単に '' としてください。"
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "メッセージを受け取りたい相手先の JID"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "メッセージの内容"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
-msgstr ""
+msgstr "PGP 鍵"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "指定した場合、メッセージはこの公開鍵で暗号化されます"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "指定した場合、メッセージはこのアカウントを使って送られます"
 
-#: gajim/gajim_remote.py:142
-#, fuzzy
+#: gajim/gajim_remote.py:143
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
 "and account. If you want to only set the latter, set OpenPGP key to \"\"."
 msgstr ""
-"名簿の相手先にチャットのメッセージを送ります。OpenPGP 鍵とアカウントは、どち"
-"らも指定しなくてもかまいません。 'アカウント'(account) だけを設定して "
-"'OpenPGP 鍵' を設定したくない場合、'OpenPGP 鍵' は単に '' としてください。"
+"名簿の相手先にチャットのメッセージを送ります。OpenPGP 鍵とアカウントは、指定"
+"しなくてもかまいません。 'アカウント'(account) だけを設定したい場"
+"合、'OpenPGP 鍵' は単に \"\" としてください。"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "件名"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "メッセージの件名"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "参加しているグループチャットに新しいメッセージを送信します。"
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "メッセージを受け取る談話室そのものの JID"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "相手先の詳細情報を取得します"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "相手先の JID"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "アカウントの詳細情報を取得します"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "アカウント名"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "相手先にファイルを転送します"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "ファイル"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "ファイルの場所"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "指定した場合、このアカウントを使ってファイルを転送します"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "すべての設定項目とその値の一覧を表示します"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "項目 'key' の値に 'value' を設定します。"
 
 # (Mako)訳さずにそのままにしよう
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:192
-#, fuzzy
+#: gajim/gajim_remote.py:193
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'key' は設定項目の名前、'value' はそれに設定したい値"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "設定項目を削除します"
 
 # (Mako)訳さずにそのままにしよう
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "key"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "削除する設定項目の名前"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim の設定の現在の状態を .config ファイルに書き出します"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "相手先を名簿から削除します"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "指定した場合、相手先はこのアカウントの相手先一覧から選択します"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "現在の在席状況を返します (もしアカウントが指定されなければ、全体の在席状況を"
 "返します)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "現在の状況メッセージを返します (もしアカウントが指定されなければ、全体の状況"
 "メッセージを返します)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "未読メッセージ数を返します"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "独自の XML を送信します"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "送信する XML"
 
-#: gajim/gajim_remote.py:240
-#, fuzzy
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4600,15 +4717,15 @@ msgstr ""
 "XML が送信されるアカウント。指定されない場合、XML はすべてのアカウントに送信"
 "されます"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "アバターを変更する"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "使いたい画像"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4616,19 +4733,19 @@ msgstr ""
 "アバターを設定するアカウント。指定されない場合、アバターはすべてのアカウント"
 "に設定されます"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Gajim が起動しているかチェックします"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "ipython ウィンドウの表示/非表示"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "引数 \"contact_jid\" がありません"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4637,15 +4754,15 @@ msgstr ""
 "'%s' は名簿にありません。\n"
 "メッセージを送るためのアカウントを指定してください。"
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "有効になっているアカウントがありません"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim が起動していないようです。そのため gajim-remote は使えません。"
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4654,16 +4771,16 @@ msgstr ""
 "使い方: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "引数:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s は見つかりません"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4676,7 +4793,7 @@ msgstr ""
 "\n"
 "コマンドは次のいずれか:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4685,7 +4802,7 @@ msgstr ""
 "引数が多すぎます。\n"
 "詳しくは \"%(basename)s help %(command)s\" と入力してください"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4860,11 +4977,6 @@ msgstr "週の終わり"
 msgid "Weekend!"
 msgstr "週末 !"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP アカウント %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4889,52 +5001,52 @@ msgstr "談話室は閉鎖されました"
 msgid "You can join this room instead: %s"
 msgstr "代わりに次の談話室に参加できます: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知の SSL エラー: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "%(nickname)s からの新しい単発メッセージ"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "グループチャット %s からの新着の私信"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s さん: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "%(nickname)s さんからのメッセージ"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "%(nickname)s さんからの新着メッセージ"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s さんの在席状況が変わりました"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s さんがサインインしました"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s さんがサインアウトしました"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "名簿にありません"
 
@@ -4943,6 +5055,8 @@ msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
 "and does not have focus"
 msgstr ""
+"この相手先のチャットウィンドウが開いていてフォーカスが当たっていない場合でも"
+"デスクトップ通知を表示する"
 
 #: gajim/common/config.py:77
 msgid "Play sound when user is busy"
@@ -5015,12 +5129,11 @@ msgstr "相手先のサインインの通知の色。"
 
 #: gajim/common/config.py:103
 msgid "Contact signout notification color"
-msgstr "相手先のサインアウトの通知の色。"
+msgstr "相手先のサインアウトの通知の色"
 
 #: gajim/common/config.py:104
-#, fuzzy
 msgid "New message notification color."
-msgstr "新着メッセージ/メールの通知の色。"
+msgstr "新着メッセージ通知の色。"
 
 #: gajim/common/config.py:105
 msgid "File transfer request notification color."
@@ -5036,7 +5149,7 @@ msgstr "ファイル転送の完了または中止の通知の色。"
 
 #: gajim/common/config.py:108
 msgid "Groupchat invitation notification color"
-msgstr "グループチャットへの招待の通知の色。"
+msgstr "グループチャットへの招待の通知の色"
 
 #: gajim/common/config.py:109
 msgid "Background color of status changed notification"
@@ -5098,11 +5211,11 @@ msgstr ""
 
 #: gajim/common/config.py:127
 msgid "Enable ASCII emoticons"
-msgstr ""
+msgstr "ASCII 感情アイコンを有効化します"
 
 #: gajim/common/config.py:129
 msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "* / _ の組を、書式指定の文字として扱う。"
+msgstr "* / _ の組を、書式指定の文字として扱います。"
 
 #: gajim/common/config.py:130
 msgid ""
@@ -5173,16 +5286,15 @@ msgid "Add * and [n] in roster title?"
 msgstr "* と [n] を名簿の題に追加するかどうか。"
 
 #: gajim/common/config.py:182
-#, fuzzy
 msgid ""
 "How many history messages should be restored when a chat tab/window is "
 "reopened?"
 msgstr ""
-"チャットのタブまたはウィンドウを再び開いたとき、以前の会話を覚えている行数。"
+"チャットのタブまたはウィンドウを再び開いたとき、再現されるメッセージの行数。"
 
 #: gajim/common/config.py:183
 msgid "How far back in time (minutes) history is restored. -1 means no limit."
-msgstr ""
+msgstr "履歴を復元する際に遡る時間 (単位は分) 。-1 は制限なし。"
 
 #: gajim/common/config.py:184
 msgid ""
@@ -5192,11 +5304,10 @@ msgstr ""
 "グループチャットに参加するとき、サーバーに要求する行数。-1 は制限なし。"
 
 #: gajim/common/config.py:185
-#, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit"
 msgstr ""
-"グループチャットに参加するとき、記録を遡る時間 (単位は分)。-1 は制限なし。"
+"グループチャットに参加するとき、記録を遡る時間 (単位は分)。-1 は制限なし"
 
 #: gajim/common/config.py:186
 msgid ""
@@ -5224,13 +5335,13 @@ msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+KeyUP で遡ることのできる行数。"
 
 #: gajim/common/config.py:193
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Either custom url with %%s in it where %%s is the word/phrase or "
 "'WIKTIONARY' which means use wiktionary."
 msgstr ""
-"独自の辞書の URL (%s を含めます。ここで %s は語/フレーズです)。または、"
-"WIKTIONARY を使う場合は単に 'WIKTIONARY' としてください。"
+"独自の辞書の URL (%%s を含めます。ここで %%s は語/フレーズです)。または、"
+"wikitionary を使う場合は単に 'WIKTIONARY' としてください。"
 
 #: gajim/common/config.py:196
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
@@ -5265,22 +5376,20 @@ msgid "Ask before closing a group chat tab/window."
 msgstr "グループチャットのタブまたはウィンドウを閉じる前に確認を求めます。"
 
 #: gajim/common/config.py:202
-#, fuzzy
 msgid ""
 "Always ask for confirmation before closing groupchats with any of the JIDs "
 "on this space separated list."
 msgstr ""
-"グループチャット JID の一覧 (空白で区切る) にあるグループチャットのタブまたは"
-"ウィンドウを閉じる前には、必ず確認を求めます。"
+"JID の一覧 (空白で区切る) にあるグループチャットのタブまたはウィンドウを閉じ"
+"る前には、必ず確認を求めます。"
 
 #: gajim/common/config.py:203
-#, fuzzy
 msgid ""
 "Never ask for confirmation before closing groupchats with any of the JIDs on "
 "this space separated list."
 msgstr ""
-"グループチャット JID の一覧 (空白で区切る) にあるグループチャットのタブまたは"
-"ウィンドウを閉じる前には、決して確認を求めません。"
+"JID の一覧 (空白で区切る) にあるグループチャットのタブまたはウィンドウを閉じ"
+"る前には、決して確認を求めません。"
 
 #: gajim/common/config.py:204
 msgid ""
@@ -5360,6 +5469,8 @@ msgid ""
 "If True, Gajim hides the Roster window on pressing the X button instead of "
 "minimizing into the Dock."
 msgstr ""
+"真なら、Gajim は X ボタンが押された際に、名簿ウィンドウを最小化するのではな"
+"く、閉じます。"
 
 #: gajim/common/config.py:240
 msgid ""
@@ -5397,16 +5508,15 @@ msgid ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 msgstr ""
-"\"none\"(なし), \"all\"(すべて) または \"in_and_out\"(入退室のみ)。\n"
-"\"none\"(なし)なら、Gajim はグループチャットに参加者が在席状況を変えた場合で"
-"もそれを表示しません。\n"
-"\"all\"(すべて)なら、すべての状況メッセージを表示します。\n"
-"\"in_and_out\"(入退室のみ)なら、Gajim はグループチャットへの参加/退出のみを表"
-"示します。"
+"\"none\"(なし), \"all\"(すべて) または \"in_and_out\"(入退室のみ)。\"none"
+"\"(なし)なら、Gajim はグループチャットに参加者が在席状況を変えた場合でもそれ"
+"を表示しません。\"all\"(すべて)なら、すべての状況メッセージを表示しま"
+"す。\"in_and_out\"(入退室のみ)なら、Gajim はグループチャットへの参加/退出のみ"
+"を表示します。"
 
 #: gajim/common/config.py:251
 msgid "Log XHTML messages instead of plain text messages."
-msgstr "プレーンテキストのメッセージではなく XHTML のメッセージを記録する。"
+msgstr "プレーンテキストのメッセージではなく XHTML のメッセージを記録します。"
 
 #: gajim/common/config.py:252
 msgid "Background color of contacts when they just signed in."
@@ -5642,19 +5752,17 @@ msgid "If True, You will also see your webcam"
 msgstr "真なら、自分のウェブカメラも表示します。"
 
 #: gajim/common/config.py:297
-#, fuzzy
 msgid ""
 "If True, Gajim will try to use a STUN server when using Jingle. The one in "
 "\"stun_server\" option, or the one given by the XMPP server."
 msgstr ""
-"真なら、Gajim は jingle を使う際に STUN サーバーを利用しようとします。サー"
-"バーは \"stun_server\" オプションか、または jabber サーバーによって与えられま"
+"真なら、Gajim は Jingle を使う際に STUN サーバーを利用しようとします。サー"
+"バーは \"stun_server\" オプションか、または XMPP サーバーによって与えられま"
 "す。"
 
 #: gajim/common/config.py:298
-#, fuzzy
 msgid "STUN server to use when using Jingle"
-msgstr "jingle を使う際に利用する STUN サーバー"
+msgstr "Jingle を使う際に利用する STUN サーバー"
 
 #: gajim/common/config.py:299
 msgid ""
@@ -5698,15 +5806,15 @@ msgstr "チャットウィンドウとウィンドウアイコンに小さなア
 
 #: gajim/common/config.py:305
 msgid "If True, Gajim will use the Systems Keyring to store account passwords."
-msgstr ""
+msgstr "真なら、Gajim はパスワードの保存にシステムのキーリングを使います。"
 
 #: gajim/common/config.py:306
 msgid "Sets the encoding used by python-gnupg"
-msgstr ""
+msgstr "python-gnupg による暗号化を行います"
 
 #: gajim/common/config.py:307
 msgid "If True, Gajim will execute XEP-0146 Commands."
-msgstr ""
+msgstr "真なら、Gajim は XEP-0146 コマンドを実行します。"
 
 #: gajim/common/config.py:323
 msgid ""
@@ -5755,13 +5863,11 @@ msgstr "このアカウントの暗号化セッションを有効にします。
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim は (可能なら) 自動的に暗号化セッションを始めるべきかどうか。"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
-msgstr "試みる接続の種類の順番 (空白で区切る)。tls, ssl または plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
+msgstr "暗号化されない接続を許可します"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
@@ -5770,7 +5876,7 @@ msgstr ""
 "試みる認証の種類 (空白で区切る)。 ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-"
 "PLUS, SCRAM-SHA-1, DIGEST-MD5, PLAIN, X-MESSENGER-OAUTH2 または XEP-0078"
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -5778,22 +5884,22 @@ msgstr ""
 "暗号化されない接続の場合、パスワードを送る前に警告のダイアログを表示します。"
 "warn(警告する)、connect(接続する)または disconnect(接続しない)"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "標準の SSL ライブラリを使う前に警告のダイアログを表示します。"
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "暗号化されない接続で平文でパスワードを送る前に、警告のダイアログを表示しま"
 "す。"
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "無視すべき SSL のエラーの一覧 (空白で区切る)。"
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
@@ -5801,16 +5907,15 @@ msgstr ""
 "記録を保存しない JID の一覧 (空白で区切る)。アカウント名も追加でき、そのアカ"
 "ウントについて記録を残しません。"
 
-#: gajim/common/config.py:359
-#, fuzzy
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 "Gajim 起動時にサーバーに保存されている記録をダウンロードする(サーバーが "
-"XEP-0136 か XEP-0313 をサポートしている場合)"
+"XEP-0313 に対応している場合)"
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
@@ -5818,25 +5923,25 @@ msgstr ""
 "相手が記録しないことを望む場合、記録しない会話を受け入れる JID の一覧 (空白で"
 "区切る)。"
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "活動停止状態の後に送られる空白"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "活動停止状態の後に XMPP ping を送ります"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr "生存パケットを送ってから再接続を試みるまで待機する時間 (単位は秒)。"
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 対策"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5844,7 +5949,7 @@ msgstr ""
 "チェックをつけると、Gajim はあなたの IP とプロキシを使います。プロキシはファ"
 "イル転送のために file_transfer_proxies オプションで定義します。"
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
@@ -5853,24 +5958,24 @@ msgstr ""
 "います。Openfire のプロキシは (正常に機能する場合でも) このテストに失敗するこ"
 "とがわかっています。"
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "受領確認に応じる"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "受領確認を求める"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Gajim が使用中の OS を通知することを許可します。"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim があなたの現地時間を通知することを許可します。"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5878,19 +5983,19 @@ msgstr ""
 "暗号化セッションを確立しようとする際、メッセージの記録をとりたいと仮定するか"
 "どうか"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "追加する相手先に送られるメッセージ"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
-"真にすると (かつサーバーがこの機能をサポートしている場合)、Gajim はほかのリ"
-"ソースによって送受されたメッセージを受信します。"
+"真にすると (かつサーバーがこの機能に対応している場合)、Gajim はほかのリソース"
+"によって送受されたメッセージを受信します。"
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
@@ -5898,57 +6003,63 @@ msgstr ""
 "真にすると、Gajim は相手先がファイル転送を行うためにあなたのローカル IP アド"
 "レスを送信します。"
 
-#: gajim/common/config.py:407
-#, fuzzy
+#: gajim/common/config.py:406
 msgid "Latest token for OAuth 2.0 authentication."
-msgstr "最近の Oauth2 認証のトークン"
+msgstr "最近の Oauth 2.0 認証のトークン"
 
-#: gajim/common/config.py:408
-#, fuzzy
+#: gajim/common/config.py:407
 msgid "client_id for OAuth 2.0 authentication."
-msgstr "Oauth2 認証の client_id"
+msgstr "Oauth 2.0 認証の client_id"
 
-#: gajim/common/config.py:409
-#, fuzzy
+#: gajim/common/config.py:408
 msgid "redirect_url for OAuth 2.0 authentication."
-msgstr "Oauth2 認証の redirect_url"
+msgstr "Oauth 2.0 認証の redirect_url"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr "次回の起動時にチャットウィンドウを開く JID の一覧 (空白で区切る)。"
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "スペル間違いを調べる言語"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
-msgstr ""
+msgstr "現在その相手先に適用する暗号化方式"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 "グループチャットに参加するとき、サーバーに要求する行数。-1 は制限なし、-2 は"
-"大域値。"
+"大域値"
 
-#: gajim/common/config.py:481
-#, fuzzy
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 "グループチャットに参加するとき、記録を遡る時間 (単位は分)。-1 は制限なし、-2 "
-"は大域値。"
+"は大域値"
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
-msgstr ""
+msgstr "この談話室でのすべてのメッセージについて通知が必要かどうか"
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
@@ -5958,79 +6069,79 @@ msgstr ""
 "す)。このオプションをプラグインの有効化/無効化のために使用しないでください。"
 "代わりに GUI を使用してください。"
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "睡眠中"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "すぐに戻ります"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "数分後に戻ります。"
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "食事"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "食事のため、しばらく離れます。"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "映画"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "ただいま映画鑑賞中です。"
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "仕事中"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "仕事中です。"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "電話中"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "電話中です。"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "外出中"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "出かけています。"
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "在席しています。"
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "チャットできます。"
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "不在です。"
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "邪魔しないでください。"
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "バイバイ !"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6038,28 +6149,28 @@ msgstr ""
 "グループチャットのメッセージに、muc_highlight_words で設定した語、またはあな"
 "たのニックネームが含まれる場合にサウンドを鳴らします。"
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "グループチャットのメッセージがあった際にサウンドを鳴らします。"
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "human"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marine"
 
 # 固有名詞(プロキシ・サーバー The Onion Router)
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 msgid "Tor"
 msgstr "Tor"
 
@@ -6136,36 +6247,49 @@ msgstr "すべての未読メッセージが転送されました。"
 msgid "Forward unread message then disconnect"
 msgstr "未読メッセージを転送してから切断"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "ファイルが空です"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "ファイルがありません"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr "ファイルが大きすぎます。最大ファイルサイズ: %s"
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "記録データベースを作ります"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "キャッシュデータベースを作ります"
 
-#: gajim/common/check_paths.py:262
-#, fuzzy, python-format
+#: gajim/common/check_paths.py:261
+#, python-format
 msgid "moving %(src)s to %(dst)s"
-msgstr "%s を %s に送信"
+msgstr "%(src)s を %(dst)s に送信"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s はファイルです。ディレクトリでなければなりません"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim は終了します"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s はディレクトリです。ファイルでなければなりません"
@@ -6175,12 +6299,12 @@ msgstr "%s はディレクトリです。ファイルでなければなりませ
 msgid "Error: cannot open %s for reading"
 msgstr "エラー: 読み込みモードで %s を開けません"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
 # (Mako) create index のこと
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "記録データベースからインデックスを作成します"
 
@@ -6189,189 +6313,189 @@ msgstr "記録データベースからインデックスを作成します"
 msgid "%s is not a valid loglevel"
 msgstr "%s は正しいログレベルではありません"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "発行者の証明書を取得できません"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "証明書失効リストを取得できません"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "証明書の署名を復号できません"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "証明書失効リストの署名を復号できません"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "発行者の公開鍵を復元できません"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "証明書の署名の失敗"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "証明書失効リストの署名の失敗"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "証明書は検証されていません"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "証明書は期限切れです"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "証明書失効リストは検証されていません"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "証明書失効リストは有効期限が切れています"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "証明書の notBefore (有効期限の始め)の書式のエラー"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "証明書の notAfter (有効期限の終わり)の書式のエラー"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "証明書失効リストの最終更新の書式のエラー"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "証明書失効リストの次回更新の書式のエラー"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "自己署名証明書"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "認証パス中の自己署名証明書"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "ローカルの発行者の証明書を取得できません"
 
 # (Mako)The first は root のことか?
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "ルート証明書が検証できません"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "認証パスが長すぎます"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "証明書は失効しています"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "検証されない認証局証明書"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "パスの長さの制限を越えています"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "証明書の目的はサポートされていません"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "証明書は信頼できません"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "証明書は却下されました"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "サブジェクトの発行者が合致しません"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "機関とサブジェクトの鍵IDが合致しません"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "機関と発行者シリアル番号が合致しません"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "証明書署名に鍵の使い方が含まれていません"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "アプリケーションの検証に失敗しました"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "アカウント \"%s\" での接続が切れました"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "手動で再接続してください。"
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "サーバー %(name)s は登録要求に対してエラーを返しました: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "サーバー %s は異なる登録フォームを提供しています"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "\"%(proxy)s\" 経由で \"%(host)s\" に接続できませんでした"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "\"%(host)s\" に接続できませんでした"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "サーバーの応答: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "プロキシへの接続に失敗"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "アカウント %s に接続できませんでした"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "アカウント %s での接続が切れました。再接続を試みます。"
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s の証明書の真正性は検証できませんでした。"
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6380,7 +6504,7 @@ msgstr ""
 "\n"
 "SSL エラー: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6389,7 +6513,7 @@ msgstr ""
 "\n"
 "未知の SSL エラー: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -6398,32 +6522,32 @@ msgstr ""
 "%s の証明書の真正性は検証できませんでした。\n"
 "この証明書はこのドメインをカバーしていません。"
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "%s に接続できませんでした"
 
 # (Mako) %s はアカウントか
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" の認証に失敗しました"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "整合性のために、ログインとパスワードを確認してください。"
 
-#: gajim/common/connection.py:2095
-#, fuzzy, python-format
+#: gajim/common/connection.py:2094
+#, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
-msgstr "送った相手先: \"%s\" (%s)"
+msgstr "送った相手先: \"%(jid)s\" (%(name)s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "送った相手先:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "在席状況が「居ないふり」のため取得できません"
 
@@ -6453,7 +6577,7 @@ msgstr ""
 
 #: gajim/common/multimedia_helpers.py:40
 msgid "Default device"
-msgstr " デフォルトのデバイス"
+msgstr "デフォルトのデバイス"
 
 #: gajim/common/multimedia_helpers.py:59
 msgid "Audio test"
@@ -7259,7 +7383,7 @@ msgid "%s configuration error"
 msgstr "%s 設定エラー"
 
 #: gajim/common/jingle_rtp.py:124
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Couldn’t setup %(text)s. Check your configuration.\n"
 "\n"
@@ -7269,13 +7393,13 @@ msgid ""
 "Error was:\n"
 "%(error)s"
 msgstr ""
-"%s を設定できませんでした。設定を見直してください。\n"
+"%(text)s を設定できませんでした。設定を見直してください。\n"
 "\n"
 "パイプライン:\n"
-"%s\n"
+"%(pipeline)s\n"
 "\n"
 "エラー:\n"
-"%s"
+"%(error)s"
 
 #: gajim/common/jingle_rtp.py:371
 msgid "audio input"
@@ -7293,275 +7417,299 @@ msgstr "ビデオ入力"
 msgid "video output"
 msgstr "ビデオ出力"
 
-#: gajim/common/helpers.py:295
-#, fuzzy
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "サーバー名は1文字以上1023文字以下にしてください"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "ホスト名に不正な文字が含まれています。"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "サーバーのアドレスが必要です。"
 
-#: gajim/common/helpers.py:309
-#, fuzzy
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "ユーザー名は1文字以上1023文字以下にしてください"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "ユーザー名に不正な文字が含まれています。"
 
-#: gajim/common/helpers.py:323
-#, fuzzy
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "リソースは1文字以上1023文字以下にしてください"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "リソースに不正な文字が含まれています。"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "取り込み中 (_B)"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "不在 (_N)"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "チャット可 (_F)"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "在席 (_A)"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "接続中です"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "離席中 (_W)"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "オフライン (_O)"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "居ないふり (_I)"
 
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "不明"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "エラーが起こっています"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "なし"
+
 # (Mako)subscription
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "相手先が承認"
 
 # (Mako)groups_post_window.ui は、メールの「差出人」に相当
 # helpers.pyは、
 # 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "こちらが承認"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "相互に承認"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "なし"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "申し込み"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "なし"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "司会者"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "司会者"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "参加者"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "参加者"
 
 # (Mako)moderated room で、発言権(voice)を持たない者
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "傍聴者"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "傍聴者"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "さんはこの会話に目を向けています"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "さんは何かほかのことをしています"
 
-#: gajim/common/helpers.py:521
-#, fuzzy
+#: gajim/common/helpers.py:522
 msgid "is composing a message…"
-msgstr "さんはメッセージを書いています..."
+msgstr "さんはメッセージを書いています…"
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "さんは書く手をちょっと止めています"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "さんは会話ウインドウを閉じました"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
 # (Mako)これと、次の "from room %s" は連続して表示される
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "保留メッセージ %d 件"
 msgstr[1] "保留メッセージ %d 件"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, python-format
 msgid "from room %s"
 msgstr " - 談話室 \"%s\""
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr " - ユーザー %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, python-format
 msgid "from %s"
 msgstr "- %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "保留イベント %d 件"
 msgstr[1] "保留イベント %d 件"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "あなたを私の相手先リストに追加したいと思います。"
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "こんにちは。私は $name です。"
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "画像の読み込みに失敗しました"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "画像が大きすぎます"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr "pyCURL がインストールされていません"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 msgid "Error loading image"
 msgstr "画像読み込みエラー"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "中継先 %s の登録情報が一定時間内に到達しませんでした"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
-msgstr ""
+msgstr "このメッセージは OTR で暗号化されており、復号することができません。"
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
+"このメッセージは伝統的な OpenPGP で暗号化されており、復号することができませ"
+"ん。このようなメッセージを扱うには PGP プラグインをインストールしてください。"
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
+"このメッセージは OpenPGP for XMPP で暗号化されており、復号することができませ"
+"ん。"
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
-msgstr ""
+msgstr "このメッセージは %s で暗号化されており、復号することができません。"
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "message"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "あなたを私の名簿に追加したいと思っています。"
 
 #: gajim/common/exceptions.py:46
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see https://dev."
 "gajim.org/gajim/gajim/wikis/help/DatabaseBackup) or remove it (all history "
 "will be lost)."
 msgstr ""
-"データベースファイル (%s) を読めません。修復を試みる (http://trac.gajim.org/"
-"wiki/DatabaseBackup を参照のこと) か、あるいは削除して (すべての履歴は失われ"
-"ます) ください。"
+"データベースファイル (%s) を読めません。修復を試みる (https://dev.gajim.org/"
+"gajim/gajim/wikis/help/DatabaseBackup を参照のこと) か、あるいは削除して (す"
+"べての履歴は失われます) ください。"
 
 #: gajim/common/exceptions.py:60
 msgid "Service not available: Gajim is not running, or remote_control is False"
@@ -7587,43 +7735,43 @@ msgstr ""
 "システムバスが有効ではありません。\n"
 "%(url)s を読んでください"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Avahi か Bonjour がインストールされているか確認してください。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "ローカルのサービスを起動できませんでした"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "ポート %d を開けません。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "avahi-daemon が起動しているか確認してください。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "アカウント \"%s\" の在席状況を変更できませんでした"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "メッセージを送信できませんでした。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "相手先はオフラインです。メッセージを送信できませんでした。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "ホストへの接続を確立できませんでした: データ送信中の時間切れです。"
@@ -7660,41 +7808,36 @@ msgid "_Reset to default"
 msgstr "デフォルトに戻す (_R)"
 
 #: gajim/data/gui/join_groupchat_window.ui:34
-#, fuzzy
 msgid "Bookmark this Groupchat"
-msgstr "この談話室をブックマークする (_B)"
+msgstr "この談話室をブックマークする"
 
 #: gajim/data/gui/join_groupchat_window.ui:51
 msgid "Join this Groupchat everytime Gajim is started"
-msgstr ""
+msgstr "Gajim 起動時にこの談話室に参加する"
 
 #: gajim/data/gui/join_groupchat_window.ui:69
-#, fuzzy
 msgid "Bookmark"
-msgstr "ブックマーク (_B)"
+msgstr "ブックマーク"
 
 #: gajim/data/gui/join_groupchat_window.ui:82
-#, fuzzy
 msgid "Autojoin"
-msgstr "自動参加 (_U)"
+msgstr "自動参加"
 
 #: gajim/data/gui/join_groupchat_window.ui:119
 msgid "Account"
 msgstr "アカウント"
 
 #: gajim/data/gui/join_groupchat_window.ui:226
-#, fuzzy
 msgid "Room"
-msgstr "談話室:"
+msgstr "談話室"
 
 #: gajim/data/gui/join_groupchat_window.ui:238
-#, fuzzy
 msgid "Recently"
-msgstr "最近使った:"
+msgstr "最近使った"
 
 #: gajim/data/gui/join_groupchat_window.ui:290
 msgid "Search the rooms on this server"
-msgstr ""
+msgstr "このサーバーの談話室を検索する"
 
 #: gajim/data/gui/manage_proxies_window.ui:12
 msgid "HTTP Connect"
@@ -7862,6 +8005,10 @@ msgstr "締め出し (_B)"
 msgid "_Add to Roster"
 msgstr "名簿に追加 (A)"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+msgid "_Execute command"
+msgstr "コマンドを実行 (_E)"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8137,11 +8284,11 @@ msgstr "概略"
 msgid "Con_tinue"
 msgstr "続ける (_T)"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "一時停止 (_P)"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "中止 (_C)"
@@ -8151,31 +8298,31 @@ msgstr "中止 (_C)"
 msgid "_Open Containing Folder"
 msgstr "フォルダを開く (_O)"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "ファイルの転送"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "ファイル転送の一覧"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "ファイル転送の転送中、完了、中止の一覧"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "消去 (_U)"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "一覧から完了、中止、失敗したファイル転送を削除します"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "ファイル転送を一覧から削除します。"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8183,32 +8330,36 @@ msgstr ""
 "一覧からひとつのファイル転送を削除します。転送中の場合、まず転送を中止し、そ"
 "れから削除します"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "選択されたファイルの転送を中止し、不完全なファイルは削除します"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "ファイルの転送を中止する"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "選択されたファイルの転送を中止します"
 
+#: gajim/data/gui/filetransfers.ui:199
+msgid "_Close"
+msgstr "閉じる (_C)"
+
 # (Mako)この場合は「閉じる」
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "ウィンドウを閉じる"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "ファイル転送が完了したら知らせる (_N)"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "ファイル転送が完了したら、ポップアップで知らせる"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "ファイル転送の一覧を表示します"
 
@@ -8218,14 +8369,14 @@ msgstr "登録 "
 
 # (Mako)ほかの項目との並びで、バランスを考えてあえてカッコでつけ加えている
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "OK (_O)"
 
 #: gajim/data/gui/groupchat_control.ui:13 gajim/data/gui/chat_control.ui:293
 #: gajim/data/gui/gajim_themes_window.ui:264
 msgid "Bold"
-msgstr "太字にする"
+msgstr "太字"
 
 #: gajim/data/gui/groupchat_control.ui:22 gajim/data/gui/chat_control.ui:302
 #: gajim/data/gui/gajim_themes_window.ui:284
@@ -8246,22 +8397,21 @@ msgstr "フォント"
 
 #: gajim/data/gui/groupchat_control.ui:76 gajim/data/gui/chat_control.ui:356
 msgid "Clear formatting"
-msgstr "書式のクリア"
+msgstr "書式の解除"
+
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
+msgid "Choose an encryption"
+msgstr "暗号化方式を選択"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "感情アイコンの一覧を表示する (Alt+M)"
 
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
-#, fuzzy
-msgid "Choose an encryption"
-msgstr "パスワード暗号化"
-
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "イベントの種類"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "イベントの説明"
 
@@ -8313,7 +8463,7 @@ msgstr "<b>0</b>"
 msgid "<b>#</b>"
 msgstr "<b>#</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -8598,9 +8748,8 @@ msgstr ""
 "い場合は、この相手先やグループチャットにはデフォルトの言語が適用されます。"
 
 #: gajim/data/gui/preferences_window.ui:466
-#, fuzzy
 msgid "Notify by icon when your messages are received"
-msgstr "グループチャットが相手先に届いたらアイコンを表示する"
+msgstr "メッセージが相手先に届いたらアイコンで通知する"
 
 #: gajim/data/gui/preferences_window.ui:531
 msgid "Show avatar in chat tabs"
@@ -8632,7 +8781,8 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:681
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "離席/不在/取り込み中/居ないふりのポップアップや通知を許可する (_A)"
+msgstr ""
+"離席/不在/取り込み中/居ないふりのとき、ポップアップや通知を許可する (_A)"
 
 #: gajim/data/gui/preferences_window.ui:698
 msgid "Allow popup/notifications when a chat window is opened"
@@ -8997,14 +9147,13 @@ msgid "Log _encrypted chat session"
 msgstr "暗号化チャットを記録する (_E)"
 
 #: gajim/data/gui/preferences_window.ui:2662
-#, fuzzy
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using End-to-End encryption the remote party has to agree on logging, "
 "else the messages will not be logged."
 msgstr ""
 "チェックをつけると、Gajim は暗号化されたメッセージを記録に残します。終端間暗"
-"号化 (E2EE) の場合は相手先が記録に同意している必要があります。そうでなければ"
+"号化 (E2EE) の場合は相手先が記録に同意してなければなりません。そうでなければ"
 "記録しないでください。"
 
 #: gajim/data/gui/preferences_window.ui:2676
@@ -9039,10 +9188,6 @@ msgstr "開く...(_O)"
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>詳細設定エディター</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "拡張"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "チャットを開始 (_C)"
@@ -9249,7 +9394,7 @@ msgstr "合わせたい相手先を選択してください"
 
 #: gajim/data/gui/edit_groups_dialog.ui:8
 msgid "Edit Groups"
-msgstr "グループの編集"
+msgstr "グループを編集"
 
 #: gajim/data/gui/search_window.ui:42
 msgid "Please wait while retrieving search form..."
@@ -9280,7 +9425,7 @@ msgid "_Open Email Composer"
 msgstr "メール作成画面を開く (_O)"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "チャットを開始 (_S)"
 
@@ -9322,6 +9467,10 @@ msgstr "設定"
 msgid "Default:"
 msgstr "デフォルト:"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr "<b><big>着信</big></b>"
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "新しい相手先を追加する"
@@ -9347,9 +9496,17 @@ msgstr "ニックネーム (_N):"
 msgid "_Group:"
 msgstr "グループ (_G):"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+msgid "Type User ID"
+msgstr "ユーザー ID を入力"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+msgid "Type Nickname"
+msgstr "ニックネーム を入力"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
-msgstr ""
+msgstr "新しいグループの型を選択"
 
 #: gajim/data/gui/add_new_contact_window.ui:257
 msgid "A_llow this contact to view my status"
@@ -9368,7 +9525,8 @@ msgid ""
 msgstr ""
 "このプロトコルの相手先を追加するためには、\n"
 "この中継先を登録してください。\n"
-"登録ボタンを押して次に進んでください。"
+"登録ボタンを押して\n"
+"次に進んでください。"
 
 #: gajim/data/gui/add_new_contact_window.ui:340
 msgid "_Register"
@@ -9382,6 +9540,10 @@ msgstr ""
 "このプロトコルの相手先を追加するためには、\n"
 "この中継先に接続してください。"
 
+#: gajim/data/gui/roster_window.ui:61
+msgid "Change Status Message…"
+msgstr "状況メッセージを変更…"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>気分:</b>"
@@ -9599,55 +9761,41 @@ msgstr "コマンドを実行...(_E)"
 msgid "_Verify"
 msgstr "検査 (_V)"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "アカウント"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b> 情報)"
 
 #: gajim/data/gui/application_menu.ui:8
-#, fuzzy
 msgid "View"
-msgstr "表示 (_V)"
+msgstr "表示"
 
 #: gajim/data/gui/application_menu.ui:11
-#, fuzzy
 msgid "Show Roster"
-msgstr "名簿を表示 (_R)"
+msgstr "名簿を表示"
 
 #: gajim/data/gui/application_menu.ui:16
-#, fuzzy
 msgid "Show Offline Contacts"
-msgstr "オフラインの相手先を表示 (_O)"
+msgstr "オフラインの相手先を表示"
 
 #: gajim/data/gui/application_menu.ui:21
-#, fuzzy
 msgid "Show Active Contacts"
-msgstr "アクティブな相手先のみ表示 (_A)"
+msgstr "アクティブな相手先のみ表示"
 
 #: gajim/data/gui/application_menu.ui:26
-#, fuzzy
 msgid "Show Transports"
-msgstr "中継先を表示 (_R)"
-
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "ファイルの転送"
+msgstr "中継先を表示"
 
 #: gajim/data/gui/application_menu.ui:43
-#, fuzzy
 msgid "Help"
-msgstr "ヘルプ (_H)"
+msgstr "ヘルプ"
 
 #: gajim/data/gui/application_menu.ui:46
-#, fuzzy
 msgid "Contents"
-msgstr "目次 (_C)"
+msgstr "目次"
 
 #: gajim/data/gui/application_menu.ui:50
-#, fuzzy
 msgid "FAQ"
-msgstr "FAQ (_F)"
+msgstr "FAQ"
 
 #: gajim/data/gui/application_menu.ui:54
 msgid "Keyboard Shortcuts"
@@ -9659,16 +9807,15 @@ msgstr "機能"
 
 #: gajim/data/gui/application_menu.ui:76
 msgid "Start Chat"
-msgstr "チャットを開始する"
+msgstr "チャットを開始"
 
 #: gajim/data/gui/application_menu.ui:81
-#, fuzzy
 msgid "Bookmarks"
-msgstr "ブックマーク (_B)"
+msgstr "ブックマーク"
 
 #: gajim/data/gui/application_menu.ui:99
 msgid "Quit"
-msgstr ""
+msgstr "終了"
 
 #: gajim/data/gui/features_window.ui:26
 msgid "<b>List of possible features in Gajim:</b>"
@@ -9702,74 +9849,57 @@ msgstr "自動参加して最小化 (_Z)"
 msgid "Pr_int status:"
 msgstr "状況の表示 (_I):"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "説明"
-
-#: gajim/data/gui/exception_dialog.ui:44
-msgid "Report Bug"
-msgstr "バグを報告する"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
-"プログラミングのエラーを検出しました。\n"
-"これは致命的ではありません。しかし、開発者に\n"
-"報告してください。"
+"プログラミングのエラーを検出しました。これは致命的ではありません。しかし、開"
+"発者に報告してください。"
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "在席通知の申し込み"
+#: gajim/data/gui/exception_dialog.ui:115
+msgid "Report Bug"
+msgstr "バグを報告する"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "拒否する (_D)"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 "承認しないと、あなたが接続したときに相手先はそのことを知ることができません"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "操作 (_A)"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "承認する (_T)"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "承認すると、あなたが接続したときに相手先はそのことを知ることができます"
 
 # (Mako)あえて訳さない
 #: gajim/data/gui/xml_console_window.ui:121
-#, fuzzy
 msgid "Presence"
-msgstr "_Presence"
+msgstr "Presence"
 
+# (Mako)あえて訳さない
 #: gajim/data/gui/xml_console_window.ui:134
 msgid "Iq"
-msgstr ""
+msgstr "Iq"
 
 # (Mako)あえて訳さない
 #: gajim/data/gui/xml_console_window.ui:149
-#, fuzzy
 msgid "Presets"
-msgstr "_Presence"
+msgstr "Presets"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "友だちを招待 !"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
@@ -9777,15 +9907,20 @@ msgstr ""
 "グループチャットを始めようとしています。\n"
 "招待する相手先を選択してください"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "グループチャットのサーバーを選択してください。"
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "グループチャットのサーバー"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "招待 (_V)"
 
@@ -9830,176 +9965,148 @@ msgid "_Search Database"
 msgstr "データベースを検索 (_S)"
 
 #: gajim/data/gui/shortcuts_window.ui:8
-#, fuzzy
 msgid "Chat Shortcuts"
-msgstr "キーボードショートカット"
+msgstr "チャットのショートカット"
 
 #: gajim/data/gui/shortcuts_window.ui:12
-#, fuzzy
 msgid "Message composition"
-msgstr "メッセージの内容"
+msgstr "メッセージ作成"
 
 #: gajim/data/gui/shortcuts_window.ui:17
-#, fuzzy
 msgid "Send the message"
-msgstr "メッセージを送信する"
+msgstr "メッセージを送信"
 
 #: gajim/data/gui/shortcuts_window.ui:24
-#, fuzzy
 msgid "Create a new line"
-msgstr "新しい投稿を作成"
+msgstr "改行"
 
 #: gajim/data/gui/shortcuts_window.ui:31
 msgid "Select an emoticon"
-msgstr ""
+msgstr "感情アイコンを選択"
 
 #: gajim/data/gui/shortcuts_window.ui:38
 msgid "Complete a command or a nick"
-msgstr ""
+msgstr "コマンドやニックネームを補完"
 
 #: gajim/data/gui/shortcuts_window.ui:45
-#, fuzzy
 msgid "Previous sent message"
-msgstr "用意されたメッセージ:"
+msgstr "前の送信済メッセージ"
 
 #: gajim/data/gui/shortcuts_window.ui:52
-#, fuzzy
 msgid "Next sent messages"
-msgstr "用意されたメッセージ:"
+msgstr "次の送信済メッセージ"
 
 #: gajim/data/gui/shortcuts_window.ui:59
-#, fuzzy
 msgid "Quote previous message"
-msgstr "状況メッセージ"
+msgstr "前のメッセージを引用"
 
 #: gajim/data/gui/shortcuts_window.ui:66
-#, fuzzy
 msgid "Quote next message"
-msgstr "メッセージを送信する"
+msgstr "次のメッセージを引用"
 
 #: gajim/data/gui/shortcuts_window.ui:73
-#, fuzzy
 msgid "Clear message entry"
-msgstr "メッセージを送信した"
+msgstr "メッセージ入力欄を消去"
 
 #: gajim/data/gui/shortcuts_window.ui:81 gajim/data/gui/shortcuts_window.ui:231
-#, fuzzy
 msgid "Appearance"
-msgstr "<b>チャットの外観</b>"
+msgstr "外観"
 
 #: gajim/data/gui/shortcuts_window.ui:86
 msgid "Toggle full / compact view"
-msgstr ""
+msgstr "全表示/簡易表示を切替"
 
 #: gajim/data/gui/shortcuts_window.ui:94
-#, fuzzy
 msgid "Recent history"
-msgstr "最近使った:"
+msgstr "最近の履歴"
 
 #: gajim/data/gui/shortcuts_window.ui:99
 msgid "Scroll up"
-msgstr ""
+msgstr "スクロールアップ"
 
 #: gajim/data/gui/shortcuts_window.ui:106
 msgid "Scroll down"
-msgstr ""
-
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "クリア (_C)"
+msgstr "スクロールダウン"
 
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
-msgstr ""
+msgstr "タブ"
 
 #: gajim/data/gui/shortcuts_window.ui:126
 msgid "Switch to the previous tab"
-msgstr ""
+msgstr "前のタブへ切替"
 
 #: gajim/data/gui/shortcuts_window.ui:133
 msgid "Switch to the next tab"
-msgstr ""
+msgstr "次のタブへ切替"
 
 #: gajim/data/gui/shortcuts_window.ui:140
 msgid "Switch to the first - ninth tab"
-msgstr ""
+msgstr "1--9番目のタブへ切替"
 
 #: gajim/data/gui/shortcuts_window.ui:147
 msgid "Switch to the previous unread tab"
-msgstr ""
+msgstr "前の未読タブへ切替"
 
 #: gajim/data/gui/shortcuts_window.ui:154
 msgid "Switch to the next unread tab"
-msgstr ""
+msgstr "次の未読タブへ切替"
 
 #: gajim/data/gui/shortcuts_window.ui:161
 msgid "Close chat"
-msgstr ""
+msgstr "会話を閉じる"
 
 #: gajim/data/gui/shortcuts_window.ui:172
-#, fuzzy
 msgid "Roster Shortcuts"
-msgstr "キーボードショートカット"
+msgstr "名簿のショートカット"
 
 #: gajim/data/gui/shortcuts_window.ui:195
-#, fuzzy
 msgid "File transfers"
 msgstr "ファイルの転送"
 
 #: gajim/data/gui/shortcuts_window.ui:202
-#, fuzzy
 msgid "Start a new chat"
-msgstr "チャットを開始する"
+msgstr "新しいチャットを開始"
 
 #: gajim/data/gui/shortcuts_window.ui:209
-#, fuzzy
 msgid "Join a group chat"
-msgstr "グループチャットで (_G)"
+msgstr "グループチャットに参加"
 
 #: gajim/data/gui/shortcuts_window.ui:216
-#, fuzzy
 msgid "Set the status message"
-msgstr "状況メッセージ"
+msgstr "状況メッセージを設定"
 
 #: gajim/data/gui/shortcuts_window.ui:223
-#, fuzzy
 msgid "Quit Gajim"
-msgstr "Gajim"
+msgstr "Gajim を終了"
 
 #: gajim/data/gui/shortcuts_window.ui:236
-#, fuzzy
 msgid "Show offline contacts"
-msgstr "オフラインの相手先を表示 (_O)"
+msgstr "オフラインの相手先を表示"
 
 #: gajim/data/gui/shortcuts_window.ui:243
-#, fuzzy
 msgid "Show only active contacts"
-msgstr "アクティブな相手先のみ表示 (_A)"
+msgstr "アクティブな相手先のみ表示"
 
 #: gajim/data/gui/shortcuts_window.ui:250
 msgid "Enable roster filtering"
-msgstr ""
+msgstr "名簿を絞り込み"
 
 #: gajim/data/gui/shortcuts_window.ui:258
-#, fuzzy
 msgid "Contacts"
 msgstr "相手先"
 
 #: gajim/data/gui/shortcuts_window.ui:263
-#, fuzzy
 msgid "Contact information"
 msgstr "相手先の情報"
 
 #: gajim/data/gui/shortcuts_window.ui:270
-#, fuzzy
 msgid "Rename contact"
 msgstr "相手先の名前を変更"
 
 #: gajim/data/gui/shortcuts_window.ui:277
-#, fuzzy
 msgid "Delete contact"
-msgstr "送った相手先:"
+msgstr "相手先を削除"
 
 #: gajim/data/gui/passphrase_dialog.ui:8
 msgid "Passphrase"
@@ -10014,7 +10121,6 @@ msgid "_In date search"
 msgstr "ある日の中で検索 (_I)"
 
 #: gajim/data/gui/history_window.ui:79
-#, fuzzy
 msgid "Only searching within selected day"
 msgstr "選択した日の中だけでの検索 "
 
@@ -10073,6 +10179,14 @@ msgstr "すべての保留イベントの表示 (_E)"
 msgid "Mute Sounds"
 msgstr "サウンドのミュート"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+msgid "_Preferences"
+msgstr "設定 (_P)"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr "終了 (_Q)"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "宛先:"
@@ -10120,7 +10234,7 @@ msgstr "<b>メッセージ:</b> "
 #: gajim/data/plugins/config_dialog.ui:17
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:17
 msgid "Check update after start"
-msgstr ""
+msgstr "起動時に更新をチェック"
 
 #: gajim/data/plugins/config_dialog.ui:103
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:103
@@ -10140,28 +10254,27 @@ msgstr "在席"
 
 #: gajim/data/plugins/config_dialog.ui:143
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:143
-#, fuzzy
 msgid ""
 "Install /\n"
 "Upgrade"
-msgstr "インストール済"
+msgstr ""
+"インストール /\n"
+"更新"
 
 #: gajim/data/plugins/config_dialog.ui:298
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:298
-#, fuzzy
 msgid "Install/Upgrade"
-msgstr "インストール済"
+msgstr "インストール/更新"
 
 #: gajim/data/plugins/plugin_installer.py:114
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:114
 msgid "Install and Upgrade Plugins"
-msgstr ""
+msgstr "プラグインのインストール/更新を行います"
 
 #: gajim/data/plugins/plugin_installer.py:138
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:138
-#, fuzzy
 msgid "Plugins updates"
-msgstr "プラグインに失敗しました"
+msgstr "プラグインの更新"
 
 #: gajim/data/plugins/plugin_installer.py:139
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:139
@@ -10171,11 +10284,14 @@ msgid ""
 "those plugins:\n"
 "%s"
 msgstr ""
+"インストールしているプラグインのいくつかに更新があります。これらを更新します"
+"か:\n"
+"%s"
 
 #: gajim/data/plugins/plugin_installer.py:251
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:251
 msgid "Security error during download"
-msgstr ""
+msgstr "ダウンロード中にセキュリティのエラー"
 
 #: gajim/data/plugins/plugin_installer.py:252
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:252
@@ -10185,11 +10301,15 @@ msgid ""
 "\n"
 "You can continue at your risk. Do you want to do so? (not recommended)"
 msgstr ""
+"ダウンロード中にセキュリティエラーが起こりました。プラグイン書庫の認証が正し"
+"く行えませんでした。これはセキュリティ攻撃かもしれません。\n"
+"\n"
+"危険を承知で続行できます。そうしますか ? (非推奨)"
 
 #: gajim/data/plugins/plugin_installer.py:268
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:268
 msgid "Error in download"
-msgstr ""
+msgstr "ダウンロード時のエラー"
 
 #: gajim/data/plugins/plugin_installer.py:269
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:269
@@ -10199,11 +10319,14 @@ msgid ""
 "\n"
 "<tt>[%s]</tt>"
 msgstr ""
+"ダウンロードの際にエラーが起こりました\n"
+"\n"
+"<tt>[%s]</tt>"
 
 #: gajim/data/plugins/plugin_installer.py:330
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:330
 msgid "All selected plugins downloaded"
-msgstr ""
+msgstr "選択したすべてのプラグインをダウンロード"
 
 #: gajim/command_system/mapping.py:164 gajim/command_system/mapping.py:174
 #: gajim/command_system/mapping.py:194
@@ -10211,9 +10334,8 @@ msgid "Missing arguments"
 msgstr "引数がありません"
 
 #: gajim/command_system/mapping.py:261
-#, fuzzy
 msgid "Too many arguments"
-msgstr "引数がありません"
+msgstr "引数が多すぎます"
 
 #: gajim/command_system/implementation/execute.py:53
 msgid "Execute expression inside a shell, show output"
@@ -10276,7 +10398,7 @@ msgstr "在席状況を「在席」に設定します"
 #: gajim/command_system/implementation/standard.py:172
 #: gajim/command_system/implementation/standard.py:249
 msgid "Clear the text window"
-msgstr "ウィンドウをクリアします"
+msgstr "ウィンドウ内を消去します"
 
 #: gajim/command_system/implementation/standard.py:177
 #: gajim/command_system/implementation/standard.py:389
@@ -10351,14 +10473,13 @@ msgid "Invite a user to a room for a reason"
 msgstr "理由を添えて、談話室に招待します"
 
 #: gajim/command_system/implementation/standard.py:295
-#, fuzzy, python-format
+#, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
-msgstr "%s を %s に招待しました"
+msgstr "%(jid)s を %(room_jid)s に招待しました"
 
 #: gajim/command_system/implementation/standard.py:299
-#, fuzzy
 msgid "Join a group chat given by a jid"
-msgstr "グループチャットで (_G)"
+msgstr "JID 指定でグループチャットに参加"
 
 #: gajim/command_system/implementation/standard.py:307
 msgid ""
@@ -10474,14 +10595,6 @@ msgstr "上書きしますか ?"
 msgid "Configuration"
 msgstr "調整"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr "URI を Gajim で開く"
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM クライアント"
@@ -10491,13 +10604,12 @@ msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber クライアント"
 
 #: data/org.gajim.Gajim.desktop.in:8
-#, fuzzy
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
-msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+msgstr "chat;messaging;im;xmpp;bonjour;voip;"
 
 #: data/org.gajim.Gajim.desktop.in:12
 msgid "org.gajim.Gajim"
-msgstr ""
+msgstr "org.gajim.Gajim"
 
 #: data/org.gajim.Gajim.appdata.xml.in:12
 msgid ""
@@ -10505,108 +10617,133 @@ msgid ""
 "Nimbuzz, Ovi, Talkonaut, and thousands of other services run by companies "
 "and ISPs, and volunteers around the world."
 msgstr ""
+"Gajim は、Jabber.org, Live Journal Talk, Nimbuzz, Ovi, Talkonaut やそのほか世"
+"界中の会社、ISP、ボランティアによる数多のサービスで使うことのできるチャットク"
+"ライアントです。"
 
 #: data/org.gajim.Gajim.appdata.xml.in:16
 msgid ""
 "If you have a few accounts on different servers, if you want to be in "
 "contact with your friends and family all the time, then Gajim is for you."
 msgstr ""
+"もし複数のサーバーのアカウントを持っていて、いつも友人や家族と連絡をとりたい"
+"と思っているなら、Gajim はそれにもってこいです。"
 
 #: data/org.gajim.Gajim.appdata.xml.in:19
-#, fuzzy
 msgid "Features:"
-msgstr "機能"
+msgstr "機能:"
 
 #: data/org.gajim.Gajim.appdata.xml.in:21
-#, fuzzy
 msgid "Tabbed chat window and single window modes"
-msgstr "ひとつのウィンドウの場合、名簿を右側にする"
+msgstr "タブ化チャットウィンドウと単一ウィンドウのモード"
 
 #: data/org.gajim.Gajim.appdata.xml.in:22
 msgid ""
 "Group chat support (with Multi-User Chat protocol), invitation, chat to "
 "group chat transformation"
 msgstr ""
+"グループチャットに対応 (Multi-User Chat プロトコル)、招待、グループチャット中"
+"継先とのチャット"
 
 #: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Emoticons, avatars, PEP (user activity, mood and tune)"
-msgstr ""
+msgstr "感情アイコン、アバター、PEP (ユーザーの動向、気分、聴いている楽曲)"
 
 #: data/org.gajim.Gajim.appdata.xml.in:24
-#, fuzzy
 msgid "Audio / video conferences"
-msgstr "音声/ビデオ"
+msgstr "音声/ビデオ会議"
 
 #: data/org.gajim.Gajim.appdata.xml.in:25
-#, fuzzy
 msgid "File transfer, room bookmarks"
-msgstr "ファイル転送のエラー"
+msgstr "ファイル転送、談話室のブックマーク"
 
 #: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Metacontacts support"
-msgstr ""
+msgstr "メタ相手先に対応"
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Trayicon, speller, extended chat history functionalities"
-msgstr ""
+msgstr "タスクトレイアイコン、スペルチェッカー、豊富なチャット履歴の機能"
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "TLS, GPG and End-To-End encryption support"
-msgstr ""
+msgstr "TLS, GPG, 端末間暗号化に対応"
 
 #: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Transport registration support"
-msgstr ""
+msgstr "中継先登録に対応"
 
 #: data/org.gajim.Gajim.appdata.xml.in:30
-#, fuzzy
 msgid "Service discovery including nodes, user search"
-msgstr "アカウント %s でサービス探索"
+msgstr "ノードやユーザー検索などのサービス探索"
 
 #: data/org.gajim.Gajim.appdata.xml.in:31
 msgid "Wikipedia, dictionary and search engine lookup"
-msgstr ""
+msgstr "Wikipedia や辞書、サーチエンジンの検索"
 
 #: data/org.gajim.Gajim.appdata.xml.in:32
 msgid "Multiple accounts support"
-msgstr ""
+msgstr "複数アカウントに対応"
 
 #: data/org.gajim.Gajim.appdata.xml.in:33
-#, fuzzy
 msgid "XML console interface"
-msgstr "XML コンソール"
+msgstr "XML コンソールインターフェース"
 
 #: data/org.gajim.Gajim.appdata.xml.in:34
 msgid "Link local (bonjour / zeroconf), BOSH"
-msgstr ""
+msgstr "リンクローカル (bonjour / zeroconf), BOSH"
 
 #: data/org.gajim.Gajim.appdata.xml.in:35
 msgid "Other features via plugins"
-msgstr ""
+msgstr "プラグインによる機能拡張"
 
 #: data/org.gajim.Gajim.appdata.xml.in:47
-#, fuzzy
 msgid "Roster, list of contacts"
-msgstr "相手先の状況変更を記録する (_L)"
+msgstr "名簿 (相手先の一覧)"
 
 #: data/org.gajim.Gajim.appdata.xml.in:51
 msgid "Tabbed chat window"
-msgstr ""
+msgstr "タブ化チャットウィンドウ"
 
 #: data/org.gajim.Gajim.appdata.xml.in:55
-#, fuzzy
 msgid "Group chat support"
-msgstr "グループチャット"
+msgstr "グループチャットに対応"
 
 #: data/org.gajim.Gajim.appdata.xml.in:59
-#, fuzzy
 msgid "Chat history"
-msgstr "最近使った:"
+msgstr "会話の履歴"
 
 #: data/org.gajim.Gajim.appdata.xml.in:63
-#, fuzzy
 msgid "Plugin manager"
-msgstr "プラグインに失敗しました"
+msgstr "プラグイン管理"
+
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP アカウント %s"
+
+#~ msgid "Exception"
+#~ msgstr "説明"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>%(jid)s</b> さんは、あなたの名簿にあるいくつかの相手先に <b>"
+#~ "%(action)s</b> を行うよう、求めています。"
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr "試みる接続の種類の順番 (空白で区切る)。tls, ssl または plain"
+
+#~ msgid "_Actions"
+#~ msgstr "操作 (_A)"
+
+#~ msgid "Open URI using Gajim"
+#~ msgstr "URI を Gajim で開く"
+
+#~ msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+#~ msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip;"
 
 #~ msgid "UPower"
 #~ msgstr "UPower"
@@ -10821,12 +10958,6 @@ msgstr "プラグインに失敗しました"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "チャットボタンを隠します"
 
-#~ msgid "File is empty"
-#~ msgstr "ファイルが空です"
-
-#~ msgid "File does not exist"
-#~ msgstr "ファイルがありません"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10852,51 +10983,6 @@ msgstr "プラグインに失敗しました"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "python-pyopenssl (0.12 より上) と pyasn1 が必要です。"
 
-#~ msgid "?user status:_Available"
-#~ msgstr "在席 (_A)"
-
-#~ msgid "?user status:Available"
-#~ msgstr "在席"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "不明"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "エラーが起こっています"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "なし"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "なし"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "なし"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "なし"
-
-#~ msgid "?print_status:All"
-#~ msgstr "すべて"
-
-#~ msgid "?print_status:None"
-#~ msgstr "なし"
-
-#~ msgid "?features:Available"
-#~ msgstr "有効"
-
-#~ msgid "?CLI:account"
-#~ msgstr "?CLI:アカウント"
-
-#~ msgid "?CLI:status"
-#~ msgstr "?CLI:在席状況"
-
-#~ msgid "?CLI:message"
-#~ msgstr "?CLI:メッセージ"
-
-#~ msgid "?CLI:priority"
-#~ msgstr "?CLI:優先順位"
-
 #~ msgid "?CLI:uri"
 #~ msgstr "?CLI:uri"
 
@@ -10910,33 +10996,6 @@ msgstr "プラグインに失敗しました"
 #~ msgstr "?CLI:パスワード"
 
 #, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "グループチャット"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "ダウンロード"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "アップロード"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "一時停止しました"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "不明"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "不明"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "不明"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "<b>役:</b>"
-
-#, fuzzy
 #~ msgid "Credentials"
 #~ msgstr "Oauth2 信任状"
 
@@ -11149,9 +11208,6 @@ msgstr "プラグインに失敗しました"
 #~ msgid "Choose _Key..."
 #~ msgstr "鍵の選択...(_K)"
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "GPG エージェントを使う (_P)"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11294,18 +11350,6 @@ msgstr "プラグインに失敗しました"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML 入力</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "フィルター:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML 入力</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "送信 (_S)"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "%s の XML コンソール"
 
diff --git a/po/kk.po b/po/kk.po
index 3a4f6b8fb..6146cc4e0 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim.trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2011-02-03 14:51+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
@@ -27,20 +27,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Қате."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Файлды шынымен жіберу керек пе?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -98,70 +98,70 @@ msgstr "Уақыт"
 msgid "Progress"
 msgstr "Барысы"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Файл аты: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Өлшемі: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Сіз"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Жіберуші: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Алушы: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сақталған: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Орналасқан буманы ашу"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Файлдармен алмасу тоқтатылды"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Тораппен байланысты орнату мүмкін емес."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Алушы: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Қате хабарламасы: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Файлдармен алмасу тоқтатылды"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -169,126 +169,126 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Жіберу үшін файлды таңдаңыз..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Жіберу"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Анықтамасы: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim файлға жете алмайды"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Бар файлды \"%s\" үстінен жазу мүмкін емес"
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Аттас файл бар болып тұр және сізде оны үстінен жазу құқығыңыз жоқ."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Бұл файл бар болып тұр"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Сіздің не істегіңіз келеді?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" бумасына жазу мүмкін емес"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Сізде ол бумада файлдарды жасауға құқығыңыз жоқ."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Файлды қалайша сақтау..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Түрі: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Анықтамасы: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s сізге файлды жібергісі келеді:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Профайлды жіберу..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Файл алмасу қатесі"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Қате файл"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Бос файлдарды жіберу мүмкін емес"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Аты:"
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Жіберуші: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Аялдату"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "Жалға_стыру"
 
@@ -450,45 +450,65 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Талап етеді: python-gnome2."
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "?features:Осында"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Мүмкіндік"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Файлды оқу қатесі:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Файлды өңдеу қатесі:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Кеңейтуге қолдау жоқ"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Суретті %(type)s пішімінде сақтау мүмкін емес. %(new_filename)s ретінде "
 "сақтау керек пе?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Суретті қалайша сақтау..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Бар "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Клиент:Белгісіз"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?ОЖ:Белгісіз"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Уақыты:Белгісіз"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "?Role in Group Chat:<b>Ролі:</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Қатысуы:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -497,46 +517,56 @@ msgstr ""
 "Бұл контакт сіздің бар болуы ақпаратыңызға қызығада, сіз болсаңыз, оған "
 "қызықпайсыз"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr "Сіз контакттың бар болуына қызығасыз, ол болса, сіздікіне қызықпайды"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Сіз бен контакт өзара бар болуы ақпаратына қызығасыз"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Сіз бен контакт өзара бар болуы ақпаратына қызығасыз"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Сіз осы контакттың өзіңіз жіберген жазылуға сұраным жауабын күтудесіз"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Кезекте жазылуға сұранымдар жоқ."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " ресурс приоритеті"
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Барлық файлдар"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Тазалау"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Прокси профайлдарын басқару"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -579,13 +609,13 @@ msgid "_New Group Chat"
 msgstr "_Жаңа чат бөлмесі"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Ростерде емес"
 
@@ -598,7 +628,7 @@ msgstr "Мен өз ростеріме сізді қосқым келеді"
 msgid "Send Single _Message…"
 msgstr "Бі_р хабарламаны жіберу..."
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "_Ол үшін қалып-күйді орнату"
@@ -616,25 +646,25 @@ msgstr "_Транспортты басқару"
 msgid "_Modify Transport"
 msgstr "Тр_анспортты басқару"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "Атын ауысты_ру"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "Б_локтамау"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Блоктау"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Ө_шіру"
@@ -648,205 +678,225 @@ msgstr "_Ақпараты"
 msgid "Send File..."
 msgstr "_Файлды жіберу..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Контакттарды _шақыру"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "Р_остерге қосу"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "Аудио сынау"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "Видео сынау"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Ақпараты"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "Тар_ихы"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Бөлмені басқару"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "_Тақырыпты өзгерту..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "_Бөлмені баптау..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Бөлме_ні жою"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "_Никті өзгерту..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "_Бөлмені бетбелгілерге қосу"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Даусы бар"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Орнатылған хабарламалар:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Жабылғанда, ростерге орналастыру"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "К_оманда орындау"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Ба_йланысты үзу"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Бөлмеге кіру"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Контакт қосу..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "Қы_зметтерді қарап шығу"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Бі_р хабарламаны жіберу..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Кеңейтілген"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Архивтеу ба_птауларын түзету"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Синхрондау"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Жекелік тізімдер"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML консолі"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "Ә_кімші"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Сервер хабарламасын жіберу..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "MOTD орнату..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "MOTD жаңарту..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "MOTD өшіру"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Бірде-бір тіркелгі қолжетерсіз"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Тіркелгілер"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "хабарлама"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Сма_йликтер:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Тарих логтар дерекқоры табылмады"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Уақыты"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Ник аты"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Хабарлама"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Тақырып"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -854,7 +904,7 @@ msgstr ""
 "Дерекқорды тазалауды қалайсыз ба? (GAJIM ҚОСУЛЫ ТҰРСА ОСЫНЫ ҚОЛДАНУ ҚАТАҢ "
 "ҰСЫНЫЛМАЙДЫ)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -868,97 +918,97 @@ msgstr ""
 "шертіңіз.\n"
 "ИӘ шертсеңіз, күте тұрыңыз..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Дерекқор қатесі"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Тарих логтарын экспорттау..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s уақытында %(who)s айтқан: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Ерекшеленген хабарламаны өшіруді шынымен қалайсыз ба?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Ерекшеленген контактпен барлық сөйлесулер тарихын өшіруді қалайсыз ба?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Қызмет табылмады"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Растауды тайдыру"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ерекшеленген хабарламаны өшіруді шынымен қалайсыз ба?"
 msgstr[1] "Ерекшеленген хабарламаларды өшіруді шынымен қалайсыз ба?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Бұл қайтарылмайтын әрекет."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Профайлды алу..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "Уақыт пішімі қате"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Уақыт пішімі ЖЖЖЖ-АА-КК түрінде болуы керек"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Ақпарат алынды"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Сервермен байланысты орнатқан жоқсыз"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Байланыс жоқ кезде сіз өзіңіздің контакт ақпаратын жариялай алмайсыз."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Профайлды жіберу..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Ақпарат жарияланған ЖОҚ"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard жариялануы қатемен аяқталды"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -976,10 +1026,10 @@ msgstr "Контакт аты: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Жалпы"
@@ -1066,36 +1116,36 @@ msgstr "%s тіркелгісіне қосқыңыз келетін контак
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Қосықыңыз келетін контакт ақпаратын енгізіңіз"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Пайдаланушы ID-і қате"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "Пайдаланушы ID-і ішінде ресурс болмау керек."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Өзіңізді өз ростеріңізге қоса алмайсыз."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Контакт ростерде бар болып тұр"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Контакт ростердіңізде бар болып тұр."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Пайдаланушы ID-і:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Қызметті қосу қатесі. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1103,59 +1153,59 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "GTK+ Jabber қолданбасы"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ нұсқасы:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK нұсқасы:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Ағымдағы жасаушылар:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Бұрынғы жасаушылар:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "Барлық дестелер жинаушыларға ризамызды білдіреміз."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2009-2010"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "%s тілі үшін сөздік қолжетерсіз"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1168,12 +1218,12 @@ msgstr ""
 "\n"
 "Қате жазылған сөздерді түспен ерекшелеу мүмкіндігі енді қолданылмайды"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Қауіпсіз емес байланыс"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1185,278 +1235,302 @@ msgstr ""
 "барлық сөйлесулеріңіз шифрленбеген түрде жүреді. Осыны жасауды шынымен "
 "қалайсыз ба?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Иә, қауіпсіз емес байланысты орнатқым келеді"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "М_ені қайта сұрамау"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "Жа_лғастыру"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "Алмаст_ыру"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Ник қате"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Ник аты ішінде рұқсат етілмеген таңбалар бар."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Жазылуға сұраным"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(account)s тіркелгісінен жазылуға сұраным түсті, кімнен: %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s жіберген жазылуға сұраным"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Бөлмеге кіру"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Қате бөлме"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Ник аты қате"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Өзіңіз таңдаған аты бар жаңа теманы жасаңыз."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Қате JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Байланыс орнатпасаңыз, топтық чатқа кіре алмайсыз."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Қате uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Бұл топтық чат"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Байланыс орнатылмаса, контакттарды синхрондай алмайсыз."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Аты"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Бұл тіркелгі серверге байланыс орнатылмаған"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Байланыспаған тіркелгімен синхрондай алмайсыз."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Синхрондау"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Жалғастырылған сөйлесу"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Жаңа чат бөлмесі"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Жаңа контакт қосу"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Байланыс орнатылмаса, пароліңізді өзгерте алмайсыз."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Пароль қате"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Парольді енгізуіңіз керек."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Парольдер өзара сәйкес келмейді"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Екі өрістегі де парольдер өзара сәйкес болуы тиіс."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Контакт кірді"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Контакт шықты"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Жаңа хабарлама"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Жаңа бір хабарлама"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Жаңа жеке хабарлама"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Жаңа E-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Файл алмасуға сұраным"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Файл алмасу қатесі"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Файл алмасу тоқтатылған"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Топ чатына шақыру"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Контакт қалып-күйін өзгертті"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "%s тіркелгісін қолданып, дара хабарлама"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "%s тіркелгісінде дара хабарлама"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Дара хабарлама"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Жіберу %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Алынған %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Пішім %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Байланыс қолжетерсіз"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" үшін байланыс орнатылғанына көз жеткізіңіз."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "%s үшін хабарламаны жіберу мүмкін емес, бұл JID дұрыс емес."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s жазған:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Тазалау"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Фильтр:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML енгізу</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Жіберу"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "қосу"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "түзету"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "өшіру"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1464,200 +1538,200 @@ msgid ""
 msgstr ""
 "<b>%(jid)s</b> ростеріңіздегі кейбір контакттарды <b>%(action)s</b> келеді."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Қосу"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Түзету"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Өшіру"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Топтар"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s маған сізді менің ростеріме қосуды ұсынған."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "%s контак қосылған"
 msgstr[1] "%s контак қосылған"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "%s контакт өшірілген"
 msgstr[1] "%s контакт өшірілген"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s үшін архивтеу баптаулары"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "%s үшін архивтеу баптаулары"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Қате орын алған"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Қате"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Жекелік тізімі <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s үшін жекелік тізімі"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Жекелік тізімі"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Реті: %(order)s, әрекеті: %(action)s, түрі: %(type)s, мәні: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Реті: %(order)s, әрекеті: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Ережені түзету</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ережені қосу</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s үшін жекелік тізімдері"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Тізім аты қате"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Жекелік тізімін жасау үшін оның атын енгізуіңіз керек."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Сізді топтық чатқа шақырған"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact сізді талқылауға қатысуға шақырған"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact сізді %(room_jid)s топ чатына қатысуға шақырған"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Түсіндірме: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Шақыруды қабылдайсыз ба?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "Клиент сертификатын таңдау #PCKS12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "PKCS12 файлдары"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Дыбысты таңдаңыз"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav дыбыстары"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Суретті таңдау"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Суреттер"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "Архивті таңдаңыз"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "Zip файлдары"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s келесідей болғанда:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "%s үшін арнайы ескертуді орнату"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "аудио мен видео"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "аудио"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "видео"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -1666,12 +1740,12 @@ msgstr ""
 "%(contact)s сізбен %(type)s сессияны бастағысы келеді. Қоңырау соғуға жауап "
 "бересіз бе?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "%s тіркелгісі үшін"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1695,68 +1769,96 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL сертификат қатесі"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Файлдармен алмасу"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E шифрлену сөндірулі"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s енді %(new_nick)s ретінде белгілі болады"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s қазір %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Жеке хабарламаны жіберу сәтсіз"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Сіз енді \"%(room)s\" топ чатында емессіз, немесе \"%(nick)s\" кетіп қалған."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Метаконтакттарды сақтау серверіңіз қолдамайды"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Тақырыпты өзгерту"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Жаңа тақырыпты көрсетіңіз:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Ник атын өзгерту"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Жаңа ник атыңызды енгізіңіз:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Топтық чаттың Jabber ID-і зате"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Топ чат Jabber ID ішінде рұқсат етілмеген таңбалар бар."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Өшірілуде %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1765,249 +1867,259 @@ msgstr ""
 "Сіз бұл бөлмені жоюды қалағансыз.\n"
 "Төменде оның себебін көрсете аласыз:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Басқа кездесу орнын көрсете аласыз:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Ник кірістіру"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "аутентификацияланған"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "аутентификацияланБАған"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s түрдегі шифрлену %(status)s және %(authenticated)s.\n"
 "Сөйлесу сессия тарихыңыз %(logged)s."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Сөйлесу - "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Жалғастырылған сөйлесу"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s тақырыпты %(subject)s етіп орнатқан"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Әр қатысушы сіздің толық JID-ды көре алады"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетеді"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "Бөлме енді қолжетерсіз қатысушыларды көрсетпейді"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Бөлме тарихын сақтау енді қосулы"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Бөлме тарихын сақтау енді сөндірулі"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Бөлме енді анонимды емес"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Бөлме енді жартылай анонимды"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Бөлме енді толық анонимды"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Бөлме тарихын сақтау қосулы"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Жаңа бөлме жасалған"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер сізге бөлме никті таңдаған не сіздегісін өзгерткен"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s тебілген болса керек: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s қазір %(nick)s қатысушысын тепкен: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s бандалған болса керек: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s қазір %(nick)s қатысушысын бандаған: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Бұдан былай %s ретінде белгілі боласыз"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s бөлімнен шығарылған (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "қатысуы өзгертілген"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "бөлімге қатысу тек мүшелер үшін деп өзгертілген"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "жүйе сөндірілуі"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(actor)s қазір %(nick)s қатысуын %(affiliation)s етіп орнатқан"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s қатысуы %(affiliation)s етіп орнатылған"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(actor)s қазір %(nick)s ролін %(role)s етіп орнатқан"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s ролі %(role)s етіп орнатылған"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s шықты"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s чат бөлмесіне кірді"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "\"%s\" топ чатынан шығуды шынымен қалайсыз ба?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Бұл терезені жапсаңыз, топ чатынан шығасыз."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "%s тебілуде"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Төменде оның себебін көрсете аласыз:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "%s банға жіберу"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Файлдармен алмасу"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Файлдармен алмасу аяқталды"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Пішімдеулер тізімін көрсету"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Контакт файлдармен алмасуды қолдамайды."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s қалып-күйі : %(state)s, себебі: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s, %(room_name)s топ чатынан"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Сессияны бастаудан бас тартылды"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "Бұл сессия серверде САҚТАЛАДЫ"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "Сессия тарихы серверде АРХИВТЕЛМЕЙДІ"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Бұл сессия шифрленген"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " және оның тарихы САҚТАЛАДЫ"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " және оның тарихы САҚТАЛМАЙАДЫ"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2015,16 +2127,16 @@ msgstr ""
 "Қашықтағы контакттың шындылығы расталмаған. Көбірек білу үшін таңбашаға "
 "шертіңіз."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E шифрлену сөндірулі"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Сіз жаңа ғана \"%s\" жіберген жаңа хабарламаны алдыңыз"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2032,7 +2144,7 @@ msgstr ""
 "Егер сіз бұл бетті жауып, тарихты сақтау сөндірілген болса, бұл хабарлама "
 "жоғалтылады."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2041,7 +2153,7 @@ msgstr ""
 "Тақырыбы: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2050,97 +2162,97 @@ msgstr ""
 "%s жіберген хабарламаны декодалау мүмкін емес\n"
 "Ол зақымдалған шығар."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s қазір %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Файлдармен алмасу"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Өлшемі: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "_Тіркелгілер"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Кіру"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Қашықтағы контакт файлдармен алмасуды тоқтатқан"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Файлды ашу қатесі"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Біріктірілген тіркелгілер"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Топтық чаттар"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Қызметтер"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Авторизация жіберілді"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "\"%s\" енді сіздің қалып-күйіңізді біле алады."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Жазылуға сұраным жіберілді"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Егер \"%s\" сіздің сұранымыңызды қабылдаса, сіз оның қалып-күйін біле аласыз."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Авторизация өшірілді"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" енді сізді әрқашан желіде емес күйінде көреді."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG қолдануға мүмкін емес"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2148,11 +2260,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Сіз бір не бірнеше чат бөлмесіне қатысушы болып тұрсыз"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2160,37 +2272,37 @@ msgstr ""
 "Қалып-күйіңізді жасырын етіп орнатсаңыз, келесі топ чаттарынан байланысты "
 "үзесіз. Жасырын етуді қалайсыз ба?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "байланыспаған"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Gajim-нан шығу керек пе?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Gajim-нан шығуды шынымен қалайсыз ба?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Gajim-ді әрқашан жабу"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "Қазір белсенді файлдармен алмасулар бар"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "Қазыр шықсаңыз, файлдармен алмасу(лар) тоқталады. Шығуды қалайсыз ба?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Сізде оқылмаған хабарламалар бар"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2198,16 +2310,16 @@ msgstr ""
 "Кейінірек оқу үшін хабарламалар тек тарихыңыз қосулы және контакт "
 "ростеріңізде болса ғана қолжетерлік болады."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Транспортты өшіру алдында келесіні оқуыңыз керек."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" транспорты өшіріледі"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2215,11 +2327,11 @@ msgstr ""
 "Бұл транспортты қолданатын барлық контакттарға бұдан былай хабарламаларды "
 "жібере не ала алмайтын боласыз."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Транспорттар өшіріледі"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2228,11 +2340,11 @@ msgstr ""
 "Келесі транспорттарды қолданатын барлық контакттарға бұдан былай "
 "хабарламаларды жібере не ала алмайтын боласыз: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Контактты блоктауды қалағансыз. Жалғастыруды қалайсыз ба?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2241,56 +2353,56 @@ msgstr ""
 "Контакт бұдан былай сізді желіде емес сияқты көреді және сіз ол сізге "
 "жібергісі келетін хабарламаларды ала алмайтын боласыз."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Контакт атын ауыстыру"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "%s контакты үшін жаңа ник атын енгізіңіз"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Топ атын ауыстыру"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "%s тобы үшін жаңа атын енгізіңіз"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Топты өшіру"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Сіз ростерден %s тобын өшіруді қалайсыз ба?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Сонымен қатар ростерден осы топтың барлық контакттарын өшіру"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP кілтін орнату"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Контактқа ілу үшін кілт таңдаңыз"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" контакты ростеріңізден өшіріледі"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Сіз \"%(name)s\" (%(jid)s) ростеріңізден өшіруді қалағансыз.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2300,11 +2412,11 @@ msgstr ""
 "оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес "
 "сияқты көреді."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Жалғастыруды қалайсыз ба?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2313,15 +2425,15 @@ msgstr ""
 "Контактты өшірумен қатар негізінде сіз оларға берген авторизацияны да "
 "өшіресіз, ол енді сізді әрқашан желіде емес сияқты көреді."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Өшіруден кейін осы контакттар менің қалып-күйімді білуін қалаймын"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Контакттар ростеріңізден өшіріледі"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2331,13 +2443,13 @@ msgstr ""
 "оларға берген авторизацияны да өшіресіз, ол енді сізді әрқашан желіде емес "
 "сияқты көреді."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Сіз таңдауыңызша қалып-күйді жіберуді қалағансыз. Жалғастырамыз ба?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2347,24 +2459,24 @@ msgstr ""
 "күйіңізді өзгерткенге дейін. Одан кейін ол сіздің негізгі қалып-күйіңізді "
 "көретін болады."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Бірде-бір тіркелгі қолжетерсіз"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Басқа контакттармен сөйлесу үшін алдымен тіркелгіні жасауыңыз қажет."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Жасырын болған кезде топ чатқа кіре алмайсыз"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Метаконтакттарды сақтау серверіңіз қолдамайды"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2373,12 +2485,12 @@ msgstr ""
 "Серверінің метаконтакттар ақпаратын сақтауды қолдамайды. Сол үшін, бұл "
 "ақпарат келесі рет қосылғаны үшін сақталмайды."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Метаконтакт жасауды қалағансыз. Жалғастырамыз ба?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2387,194 +2499,194 @@ msgstr ""
 "Метаконтакт - бірнеше бірлік контактты бір жолға біріктіру тәсілі. Әдетте ол "
 "бір адамның бірнеше Jabber не транспорт тіркелгілері бар болса қолданылады."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Файл URI қате:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Бұл файлды %s үшін жіберуді қалайсыз ба:"
 msgstr[1] "Бұл файлдарды %s үшін жіберуді қалайсыз ба:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "%s қазір %s үшін жіберу"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s бірінші контакт қылу"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "%s және %s метаконтакт жасау"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "Қалып-кү_й хабарламасын өзгерту"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Өленді жариялау"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "Орналасуды жариялау"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Қызметтерді баптау..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "Бар_лығын жазу"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Топ ү_шін хабарлама жіберу"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Барлық пайдаланушыларға"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Барлық желідегі пайдаланушыларға"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Шақыру"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Контакттарды басқару"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Топтар_ды түзету"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "Өші_ру"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Максималды қылу"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "Қа_йта байланысу"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "Ба_йланысты үзу"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "Тар_ихы"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Тарихты басқару"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "Жаңа _чат бөлмесіне кіру"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "Қалып-кү_й хабарламасын өзгерту"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Жүйелік сөре таңбашасын көрсету:"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Тек ростерде көрсету"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Кеңейтілген баптаулар түзетушісі"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s баптау қатесі"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Configure logging system"
 msgstr "%s баптау"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Қат_ыспаған оқиғаларды көрсету"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Дерекқор қатесі"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Сіздің не істегіңіз келеді?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Байланыс орнату"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Оқылмаған хабарламаларды бағдарлау"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2583,7 +2695,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2591,7 +2703,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2736,16 +2848,16 @@ msgstr "Тіркелгі сөндірулі"
 msgid "To unregister from a server, account must be enabled."
 msgstr "Серверден тіркелуді өшіру үшін тіркелгі қосулы тқұру керек."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Пароль керек"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s тіркелгіңіз үшін парольді енгізіңіз"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Парольді сақтау"
 
@@ -2775,10 +2887,18 @@ msgstr "Тіркелгіні тек Gajim ішінен өшіру"
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ешнәрсе өшірмеу. Кейін қайталап көремін"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Барлық"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Тек кіру мен шығу"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Жоқ"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Жаңа чат бөлмесі"
@@ -2843,11 +2963,11 @@ msgstr "Қате мән"
 msgid "Custom port must be a port number."
 msgstr "Таңдауыңызша порт нөмірі түрінде берілуі тиіс."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Сертификат файлда бар болып тұр"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат %s файлында бар болып тұр, сол үшін қайта қосылмайды."
@@ -2951,90 +3071,112 @@ msgstr "Сізді біреу бөлмеде еске алған"
 msgid "Group Chat Message Received"
 msgstr "Бөлмеде хабарлама алынды"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s осы чат бөлмесінде"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Жоқ"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Мүше"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Әкімші"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Иесі"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [блокталған]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [қайырылған]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Байланысқан"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Байланыспаған"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Беру"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Тарату"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Түрі: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Берілген: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Басталмаған"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Тоқтатылған"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Аяқталған"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:Аялдатылған"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Тежеліп қалған"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Алмасуда"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Қалып-күй:"
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "?user status:Осында"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Чатқа дайын"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Кетіп қалған"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Бос емес"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Қол жетерсіз"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Желіде емес"
 
@@ -3083,122 +3225,126 @@ msgstr "(Ешнәрсе)"
 msgid "Hidden"
 msgstr "Жасырын"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Сіз бен %s сөйлесулер тарихы"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Чат тарихы"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Диск қатесі"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s қазір %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Қате: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Қате"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Қазір қалып-күйі: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Қазір қалып-күйі: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тақырыбы: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Қалып-кү_й хабарламасын өзгерту"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "%s тіркелгісін қолданып"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Бетбелгілерді басқару"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "Р_остерді жасыру"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "_Ростерді көрсету"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Бұл мәзірді жасыру"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "Суретті жүктеу мүмкін емес"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Медиаға қолдау жоқ: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "Бұр өріс міндетті"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "жаңа@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "жаңа%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Хост аты:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Сервер жауабы: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3357,7 +3503,7 @@ msgstr "Жаз_ылу"
 msgid "_Unsubscribe"
 msgstr "Жа_зылудан бас тарту"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3365,51 +3511,57 @@ msgstr ""
 "Осы сызықтан кейінгі мәтін сіз осы чатқа соңғы рет\n"
 "көңіл аударғаныңыздан кейін айтылған"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Дәйексөз"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\" үшін әре_кет"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "_Википедия мақаласын оқу"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "_Сөздіктен іздеу"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "\"%s\" сөздіктен іздеу сілтемесі емес және ол WIKTIONARY емес"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Келесі нәрсе вебтен іздеу сілтемесі емес: \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Ол ү_шін веб іздеу"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Сіл_теме ретінде ашу"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Қате JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3421,30 +3573,35 @@ msgstr[1] "%i күн бұрын"
 msgid "Write a message.."
 msgstr "Хабарлама алу"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Сіз бірнеше чатты жабуды таңдадыңыз"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Сіз олардың барлығын жабуды таңдайсыз ба?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Чат бөлмелері"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Жеке чаттар"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Хабарламалар"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3456,108 +3613,108 @@ msgstr ""
 "керек.\n"
 "Басқа никты төменде көрсетіңіз:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Осындай қолайсыздық болса әрқашан осы никты қолдану"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Бұл сұранымды қабылдайсыз ба?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "%s тіркелгісіндегі бұл сұранымды қабылдайсыз ба?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) %(url)s үшін авторизация (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Байланысу сәтсіз"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "%s бөлмесіне кіру үшін пароль керек. Оны көрсетіңіз."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Қаріп</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Сізді %s топ чатынан бандаған."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "%s топтық чаты жоқ."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "%s топтық чаты жоқ."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Топтық чаттарды жасау рұқсат етілмеген."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Чат бөлмесіне кіру мүмкін емес"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Сіздің тіркелген ник атыңыз %s топ чатында қолданылуы керек."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Сіз %s топ чат мүшелері тізімінде емессіз."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Қате %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s жіберу кезіндегі қате ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Жазылуға сұраным"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Байқаушылар"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Авторизация қабылданды"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" контакты өз қалып-күйін көруге сізге авторизация берген."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" контакты сізден өзіне жазылуды өшіріп тастаған"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3566,31 +3723,31 @@ msgstr ""
 "Сіз енді оны әрқашан да желіде емес ретінде көресіз.\n"
 "Оны өз контакттар тізіміңізден өшіруді қалайсыз ба?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Жазылмаған"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" үшін байланысты орнату мүмкін емес"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Байланысты тексеріңіз не кейін қайталап көріңіз."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3599,37 +3756,37 @@ msgstr ""
 "Сіз Gajim-ды GPG агентін қолдануға баптағансыз, бірақ, қосулы тұрған GPG "
 "агенті жоқ немесе ол қате кілтсөзді қайтарған.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Сіз қазір өзіңіздің OpenPGP кілтсіз-ақ қосулы тұрсыз."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Кілтсөз қате"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Кілтсөз қате"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Сертификат мерзімі біткен"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 "%(keyid)s кілті үшін GPG кілт құпия сөзін енгізіңіз (%(account)s тіркелгісі)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Өзіңіздің OpenPGP кілтіңізді таңдаңыз"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3638,96 +3795,101 @@ msgstr ""
 "Бұл чатты шифрлеу үшін қолданылатын GPG кілті сенімді емес. Бұл хабарламаны "
 "шифрлеуді шынымен қалайсыз ба?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s сізге файлды жібергісі келеді:"
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL сертификат қатесі"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Файлдармен алмасу аяқталды"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "%(name)s жіберген %(filename)s файлын алу тоқтатылды."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Сіз %(filename)s файлын %(name)s үшін сәтті жібердіңіз."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(filename)s файлын %(name)s үшін жіберу тоқтатылды."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "%(filename)s файлын %(name)s үшін жіберу тоқтатылды."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Жіберу үшін файлды таңдаңыз..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Хабарламаны декодалау мүмкін емес"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Пайдаланушы аттардың ерегісуі"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Жергілікті тіркелгіңіз үшін жаңа пайдаланушы атын енгізіңіз"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Ресурстар ерегісуі"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Сіз осы тіркелгіге осы ресурспен қосулы тұрсыз. Жаңасын көрсетіңіз"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s сізбен дауыс чатын бастағысы келеді."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Дауыс чатына сұраным"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "SSL сертификатын растау қатесі"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3738,7 +3900,7 @@ msgstr ""
 "%(error)s\n"
 "Сонда да сервермен байланысты орнатуды қалайсыз ба?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3751,15 +3913,15 @@ msgstr ""
 "Сертификаттың SHA1 баспасы:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Бұл сертификат үшін осы қатені елемеу."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3780,7 +3942,7 @@ msgstr ""
 "\n"
 "Сонда да байланыс орнату мен сертификат баспасын жаңартуды қалайсыз ба?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3788,7 +3950,7 @@ msgstr ""
 "Қауіпсіз емес байланыс арқылы пароліңізді жібересіз. Осыған жол бермеу үшін "
 "PyOpenSSL орнатуыңыз керек. Осыны жасауды шынымен қалайсыз ба?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3796,23 +3958,23 @@ msgstr ""
 "Қауіпсіз емес байланыс арқылы шифрленбеген пароліңізді жібересіз. Осыны "
 "жасауды шынымен қалайсыз ба?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Бұл топтық чат"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Смайликтер сөндірулі"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 "Сіз баптаған смайликтер темасы табылмады, сол үшін смайликтер сөндірілген."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3820,11 +3982,11 @@ msgid ""
 msgstr ""
 "Сіз баптаған смайликтер темасы табылмады, сол үшін смайликтер сөндірілген."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Бұл топтық чат"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3832,32 +3994,32 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Баптауларыңызды сақтау мүмкін емес"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "бастапқысы"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Кілтсөз керек"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "%(keyid)s кілті үшін GPG кілт құпия сөзін енгізіңіз (%(account)s тіркелгісі)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG кілтінің мерзімі біткен"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
@@ -3865,11 +4027,11 @@ msgstr ""
 "Сіздің GPG кілтіңіздің мерзімі біткен, сол үшін сіз %s үшін байланысыңыз "
 "OpenPGP-сіз іске асырылады."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Кілтсөз қате"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Өзіңіздің GPG кілтсөзіңізді қайта енгізіңіз не Бас тартуды қалаңыз."
@@ -3941,6 +4103,11 @@ msgstr "- хабарламалар логқа сақталады"
 msgid "- messages will not be logged"
 msgstr "- хабарламалар логқа сақталмайды"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3971,7 +4138,7 @@ msgstr "Қате форма"
 msgid "The form is not filled correctly."
 msgstr "Форма дұрыс толтырылмаған."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Жасырын"
 
@@ -4103,6 +4270,56 @@ msgstr ""
 "%s\n"
 "Link-local хабарламалары дұрыс істемеуі мүмкін."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Жергілікті қызметті қосу мүмкін емес"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Суретті жүктеу мүмкін емес"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Қызмет қатені қайтарған."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Суретті жүктеу мүмкін емес"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Байланыс қолжетерсіз"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Тақырыбы"
@@ -4128,7 +4345,17 @@ msgstr "Ағымдағы теманы өшіре алмайсыз"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Біріктірілген тіркелгілер"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "G_PG агентін қолдану"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Жақында боламын."
 
@@ -4149,6 +4376,11 @@ msgstr "Сізде %s тіркелгісінен чаттар ашулы тұр"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Барлық чаттар мен топ чаттары жабылады. Жалғастыруды қалайсыз ба?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "Өші_ру"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4343,50 +4575,64 @@ msgstr "Парольді өзгерту"
 msgid "Login Options"
 msgstr "Сма_йликтер:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus бұл машинада жоқ не керек python модулі жоқ"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Көрсетілген команда үшін көмекті көрсетеді"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "команда"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "команда көмегін көрсету"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Ростер терезесін көрсетеді не жасырады"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Келесі кезектегі оқиға бар қалқымалы терезені көрсетеді"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Ростердегі бар контакттар тізімін шығарады. Әр контакт бөлек жолда болады"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "тіркелгі"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "тек көрсетілген тіркелгі контакттарын көрсету"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Бар тіркелгілер тізімін шығарады"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Тіркелгі не тіркелгілердің қалып-күйін өзгерту"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "күйі"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4395,11 +4641,17 @@ msgstr ""
 "қалған, мазамды алмаңыз, жасырын. Орнатылмаса, тіркелгінің алдыңғы күйі "
 "қолданылады"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "хабарлама"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "қалып-күй хабарламасы"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4407,16 +4659,21 @@ msgstr ""
 "\"Тіркелгі\" тіркелгісінің қалып-күйін өзгертеді. Көрсетілмесе, \"sync with "
 "global status\" опциясы орнатылған барлық тіркелгілерге әсер етеді"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Бір не бірнеше тіркелгі үшін приоритетті өзгертеді"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "приоритет"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "тіркелгіге бергіңіз келетін приоритет"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4424,7 +4681,7 @@ msgstr ""
 "көрсетілген тіркелгінің қалып-күйін өзгерту. Көрсетілмесе, барлық \"sync "
 "with global status\" опциясы орнатылған тіркелгілерге әсер етеді"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4434,29 +4691,29 @@ msgstr ""
 "тіркелгіні көрсету міндетті емес. Егер сіз 'OpenPGP key'-сіз тек 'account'-"
 "ты орнатқыңыз келсе, 'OpenPGP key' мәнін '' етіп орнатыңыз."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "Хабарламаны алатын контакттың JID-і"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "хабарлама құрамасы"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "көрсетілсе, хабарлама бұл ортақ кілтпен шифрленеді"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "көрсетілсе, хабарлама бұл тіркелгіні қолданып жіберіледі"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4466,121 +4723,121 @@ msgstr ""
 "тіркелгіні көрсету міндетті емес. Егер сіз 'OpenPGP key'-сіз тек 'account'-"
 "ты орнатқыңыз келсе, 'OpenPGP key' мәнін '' етіп орнатыңыз."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "тақырып"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "хабарлама тақырыбы"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Сіз кірген топ чатына жаңа хабарламаны жіберу."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "хабарламаны алатын бөлменің JID-і"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Контакттың толық ақпаратын алу"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "Контакт JID-і"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Тіркелгінің толық ақпаратын алу"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Тіркелгі аты"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Контактқа файлды жібереді"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Файл орналасуы"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "көрсетілсе, файл бұл тіркелгіні қолданып жіберіледі"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Барлық баптаулар мен олардың мәндерін тізіп шығу"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "'key' мәнін 'value' етіп орнатады."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'key' - баптаудың аты, 'value' - орнатылатын мәні"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Баптау элементін өшіру"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "кілт"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "өшірілетін баптау аты"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim ағымдағы баптауларын .config файлына жазу"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Ростерден контактты өшіреді"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "көрсетілсе, контакттар бұл тіркелгінің тізімінен алынады"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Ағымдағы қалып-күйді қайтарады (тіркелгі көрсетілмесе, жалпыны қолданады)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Ағымдағы қалып-күй хабарламасын қайтарады (тіркелгі көрсетілмесе, жалпыны "
 "қолданады)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Оқылмаған хабарламалар саның қайтарады"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Таңдауыңызша XML жіберу"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "Жіберілетін XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4588,15 +4845,15 @@ msgid ""
 msgstr ""
 "Xml жібетілетін тіркелгі; көрсетілмесе, xml барлық тіркелгілерге жіберіледі"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Аватарды өзгерту"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Қолдану үшін сурет"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4604,19 +4861,19 @@ msgstr ""
 "Аватар орнатылатын тіркелгі; көрсетілмесе, аватар барлық тіркелгілерге "
 "орнатылады"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Gajim қосулы тұрғанына көз жеткізіңіз"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "ipython терезесін көрсетеді не жасырады"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "\"contact_jid\" аргументі жоқ"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4625,15 +4882,15 @@ msgstr ""
 "'%s' ростеріңізде жоқ.\n"
 "Хабарламаны жіберу үшін тіркелгіні көрсетіңіз."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Сізде белсенді тіркелгі жоқ"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim қосулы емес сияқты. Сол үшін gajim-remote қолдануға болмайды."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4642,16 +4899,16 @@ msgstr ""
 "Қолданылуы: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Аргументтер:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s табылмады"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4662,7 +4919,7 @@ msgstr ""
 "Қолданылуы: %s команда [аргументтері]\n"
 "Команда - келесілердің біреуі:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4671,7 +4928,7 @@ msgstr ""
 "Аргументтер тым көп. \n"
 "Көбірек білу үшін \"%(basename)s help %(command)s\" енгізіңіз"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4845,11 +5102,6 @@ msgstr "Апта аяғы"
 msgid "Weekend!"
 msgstr "Демалыс!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP тіркелгісі %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4874,52 +5126,52 @@ msgstr "Бөлме жойылған"
 msgid "You can join this room instead: %s"
 msgstr "Оның орнына мына бөлмеге кіре аласыз: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Белгісіз SSL қатесі: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "%(nickname)s жіберген бір жаңа хабарлама"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "%s топ чатынан жаңа жеке хабарлама"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "%(nickname)s жазған"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "%(nickname)s жіберген жаңа хабарлама"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s күйін өзгерткен"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s желіге кірді"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s желіден шықты"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Ростерде емес"
 
@@ -5755,22 +6007,18 @@ msgstr "Бұл тіркелгі үшін ESessions шифрлеуді іске �
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Қолжетерлік болса, Gajim шифрленген сессияны бастау керек пе?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Көру үшін байланыс түрлерінің реттелген тізімі (арасы бос аралық). Құрамында "
-"tls, ssl не plain бола алады"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5779,11 +6027,11 @@ msgstr ""
 "Парольдерді шифрленбеген байланыс арқылы беру алдында ескерту сұхбатын "
 "көрсету."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Қалыпты SSL жинығын қолдану алдында ескерту сұхбатын көрсету."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -5791,37 +6039,37 @@ msgstr ""
 "ШИФРЛЕНБЕГЕН парольдерді шифрленбеген байланыс арқылы беру алдында ескерту "
 "сұхбатын көрсету."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Елемеу үшін ssl қателер тізімі, бос аралықпен ажыратылсын."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Белсенді еместіктен кейін бос аралық жіберліген"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "Белсенді еместіктен кейін XMPP ping жіберліген"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5830,11 +6078,11 @@ msgstr ""
 "Байланысты қайта орнатпас бұрын, ping alive дестесіне жауапты қанша секунд "
 "күту керек."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 жұмысы"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5842,90 +6090,100 @@ msgstr ""
 "Белгіленген болса, Gajim файлдармен алмасулар үшін сіздің IP бен "
 "file_transfer_proxies опциясындағы прокси адрестерін қолданады."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Алу сұранымдарына жауап"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Алу сұранымы жіберілді"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Gajim-ге сіздің операциялық жүйеңіз туралы ақпаратты жіберуге рұқсат ету."
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim-ге сіздің жергілікті уақытты жіберуге рұқсат ету."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 "Шифрленген сессия кезінде Gajim хабарламаларыңызды тарихқа сақтауы керек пе?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "Қосқыңыз келетін контакттарға жіберілетін хабарлама"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Анонимды аутентификация"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Анони_мды аутентификация"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Анони_мды аутентификация"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Қай тілде емлені тексеру керек"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr "Топ чатына кірген кезде серверден қанша тарих жолын сұрау керек."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
@@ -5934,11 +6192,11 @@ msgstr ""
 "Топ чатына кірген кезде қанша минут бұрынғы сөйлесулердің тарих жолдарын "
 "сұрау керек."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 #, fuzzy
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
@@ -5949,79 +6207,79 @@ msgstr ""
 "Gajim жұмыс аяқтағанда сақталады). Бұл опция плагиндерді белсенді(емес) қылу "
 "үшін ҚОЛДАНБАҢЫЗ. Орнына GUI қолданыңыз."
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Ұйқыда"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Жақында ораламын"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Бірнеше минутта ораламын."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Тамақ ішуде"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Мен тамақ ішудемін, хабарламаңызды қалдырыңыз."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Кино"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Кино көрудемін."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Жұмыс істеудемін"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Мен жұмыс істеп отырмын."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Мен телефонмен сөйлесудемін."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Жоқ"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Мен өмірмен рахаттанып отырмын."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Мен бармын."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Мен чат үшін дайынмын."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Мен жоқпын."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Мазамды алмаңыз."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Қош!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6029,27 +6287,27 @@ msgstr ""
 "Топ чат хабарламасында muc_highlight_words ішінде көрсетілген сөздердің "
 "біреуі не сіздің ник атыңыз кездескен кезде ойналатын дыбыс."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "MUC хабарламасы келген кезде ойналатын дыбыс."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "human"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Оған"
@@ -6127,36 +6385,49 @@ msgstr "Барлық оқылмаған хабарламалар бағдарл�
 msgid "Forward unread message then disconnect"
 msgstr "Оқылмаған хабарламаны бағдарлау мен шығу"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Файл бос"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Файл жоқ"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "логтар дерекқорын жасау"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "кэш дерекқорын жасау"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "%s қазір %s үшін жіберу"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s файл екен, алайда бума болуы тиіс еді"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim қазір өз жұмысын аяқтайды"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s бума екен, алайда файл болуы керек еді"
@@ -6166,11 +6437,11 @@ msgstr "%s бума екен, алайда файл болуы керек еді
 msgid "Error: cannot open %s for reading"
 msgstr "Қате: оқу үшін %s ашу мүмкін емес"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "көгілдір"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "тарих дерекқорын индекстарға көшірту"
 
@@ -6179,192 +6450,192 @@ msgstr "тарих дерекқорын индекстарға көшірту"
 msgid "%s is not a valid loglevel"
 msgstr "%s дұрыс loglevel емес"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Шығарушы сертификатын алу мүмкін емес"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Сертификат үшін CRL алу мүмкін емес"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Сертификат қолтаңбасын декодалау мүмкін емес"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "CRL қолтаңбасын декодалау мүмкін емес"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Шығарушының ортақ кілтін декодалау мүмкін емес"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Сертификат қолтаңба қатесі"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "CRL қолтаңба қатесі"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Сертификат мерзімі әлі басталмаған"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Сертификат мерзімі біткен"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL мерзімі әлі басталмаған"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL мерзімі біткен"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Сертификаттың notBefore өрісіндегі пішім қатесі"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Сертификаттың notAfter өрісіндегі пішім қатесі"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "CRL lastUpdate өрісіндегі пішім қатесі"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "CRL nextUpdate өрісіндегі пішім қатесі"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Жады жеткіліксіз"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Өздігінен қолтаңбасы бар сертификат"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Сертификаттар тобындағы өздігінен қолтаңбасы бар сертификат"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Жергілікті шығарушы сертификатын алу мүмкін емес"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Бірінші сертификатты тексеру мүмкін емес"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Сертификаттар тізімі тым үлкен"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Сертификат қайта шақырылған"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "CA қате сертификаты"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Жол ұзындық шектеуі асырылған"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Қолдау жоқ сертификат мақсаты"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Сертификатқа сенім жоқ"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Сертификат тайдырылған"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Сертификатты ұсынушының сәйкес еместігі"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 "Сертификаттау орталығы мен иесі кілттерінің идентификаторлары өзара сәйкес "
 "емес"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 "Сертификаттау орталығы мен ұсынушы кілттерінің идентификаторлары өзара "
 "сәйкес емес"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Кілтті қолдану сертификаттарға қолтаңбаны қою қамтымайды"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Қолданбаны растау қатесі"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" тіркелгісімен байланыс үзілді"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Қолмен қайта байланысты орнату."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "%(name)s сервері тіркелу сұранымына қате жауап берген: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "%s сервері басқа тіркелу формасын ұсынды"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "\"%s\" үшін байланыс орнату мүмкін емес"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "\"%s\" үшін байланыс орнату мүмкін емес"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер жауабы: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Проксиге байланыс орнату сәтсіз аяқталды"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "%s тіркелгісіне байланыс орнату сәтсіз аяқталды"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "%s тіркелгісімен байланыс үзілген. Қайтадан орнатып көреміз."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s сертификатының нақтылығы қате болуы мүмкін."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6373,7 +6644,7 @@ msgstr ""
 "\n"
 "SSL Қатесі: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6382,38 +6653,38 @@ msgstr ""
 "\n"
 "Белгісіз SSL қатесі: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "%s сертификатының нақтылығы қате болуы мүмкін."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "\"%s\" үшін байланыс орнату мүмкін емес"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" үішн аутентификация сәтсіз"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Тіркелгі атын мен пароліңізді тексеріңіз."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Жіберген контакт: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Жіберілген контакттар:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Жасырын қалып-күй нәтижесінде алынбаған"
 
@@ -7291,258 +7562,282 @@ msgstr "видео кірісі"
 msgid "video output"
 msgstr "видео шығысы"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Хост атындағы қате таңба."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Сервер адресі керек."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Пайдаланушы аты 1 мен 1023 таңба арасында болуы керек"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Пайдаланушы атындағы қате таңба."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Сервер 1 мен 1023 таңба арасында болуы керек"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Ресурс атындағы қате таңба."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Бос емес"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "Қо_л жетерсіз"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Чатқа дайын"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "?user status:_Осында"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Байланыс орнату"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "К_етіп қалған"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "Желі_де емес"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Жасырын"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?контакт күйі:Белгісіз"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?контакт күйі:Қателері бар"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Жоқ"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Оған"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Одан"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Екеуі де"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Жоқ"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Жазылу"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Жоқ"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Модераторлар"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Қатысушылар"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Қатысушы"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Қонақтар"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Қонақ"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "хабарламаға көңіл аударды"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "басқа нәрсемен айналысуда"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "хабарлама жазып тұр..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "хабарлама жазуды аялдатқан"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "чат терезесін не бетін жапты"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s Гиб"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s МиБ"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s КиБ"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d хабарлама бар"
 msgstr[1] "%d хабарлама бар"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " %s бөлмесінен"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " %s пайдаланушысынан"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr ", қайдан: %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d оқиға бар"
 msgstr[1] "%d оқиға бар"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Мен сізді өзімнің контакттар тізіміне қосқым келеді."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "Сәлем, мен - $name."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Суретті жүктеу уақыты бітті"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Сурет тым үлкен"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL мерзімі әлі басталмаған"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Суретті жүктеу уақыты бітті"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "%s транспорты үшін тіркелу ақпараты уақытында келмеген"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "хабарлама"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Мен өз ростеріме сізді қосқым келеді"
 
@@ -7580,43 +7875,43 @@ msgstr ""
 "Жүйелік шина қолжетерсіз.\n"
 "Келесіні оқыңыз: %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Avahi не Bonjour орнатулы тұрғанды тексеріңіз."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Жергілікті қызметті қосу мүмкін емес"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "%d портын басқару мүмкін емес."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "avahi-daemon қосулы тұрғанын тексеріңіз."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "\"%s\" тіркелгісінің күйін өзгерту мүмкін емес"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Хабарламаңызды жіберуге мүмкіндік жоқ"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт желіде емес. Хабарламаңызды жіберу мүмкін емес."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7857,6 +8152,11 @@ msgstr "_Бан"
 msgid "_Add to Roster"
 msgstr "Р_остерге қосу"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "К_оманда орындау"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8138,11 +8438,11 @@ msgstr "Өзім туралы"
 msgid "Con_tinue"
 msgstr "Жалға_стыру"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Аялдату"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Бас тарту"
@@ -8151,32 +8451,32 @@ msgstr "_Бас тарту"
 msgid "_Open Containing Folder"
 msgstr "_Орналасқан буманы ашу"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Файлдармен алмасу"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "файлдармен алмасу тізімі"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Белсенді, аяқталған және тоқтатылған файлдармен алмасулар тізімі"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Тазарт_у"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Тізімнен аяқталған, бас тартылған және сәтсіз аяқталған алмасуларды өшіреді"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Тізімнен файлдармен алмасуды өшіру."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8184,32 +8484,37 @@ msgstr ""
 "Бұл әрекет тізімнен бір файлдармен алмасуды өшіреді. Ол алмасу белсенді "
 "болса, алдымен тоқтатылады, содан кейін өшіріледі"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Бұл файлдармен алмасудан бас тарту және толық емес файлдарды өшіру"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Файлдармен алмасудан бас тарту"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Бұл файлдармен алмасудан бас тарту"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Жіберу мен жабу"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Терезені жасырады"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "Файлдармен алмасу аяқталға_нда, мені ескерту"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Файлдармен алмасу аяқталған кезде қалқымалы хабарламаны көрсету"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Сіз бен басқалар арасындағы файл алмасуларды көрсетеді"
 
@@ -8218,7 +8523,7 @@ msgid "Register to"
 msgstr "Қайда тіркелу:"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_ОК"
 
@@ -8249,20 +8554,20 @@ msgstr "Қаріп"
 msgid "Clear formatting"
 msgstr "Пішімдеуді тазарту"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Смайликтер тізімін көрсету (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Клиент сертификатын таңдау"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Смайликтер тізімін көрсету (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "Оқиға түрі"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "Оқиға анықтамасы"
 
@@ -8324,7 +8629,7 @@ msgstr "<b>Қаріп</b>"
 msgid "<b>#</b>"
 msgstr "<b>Қаріп</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9064,10 +9369,6 @@ msgstr "А_шу..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Кеңейтілген баптаулар түзеткіші</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Кеңейтілген"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "_Чатты бастау"
@@ -9309,7 +9610,7 @@ msgid "_Open Email Composer"
 msgstr "Email қ_олданбасын ашу"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "Чатты ба_стау"
 
@@ -9354,6 +9655,10 @@ msgstr "Баптаулар"
 msgid "Default:"
 msgstr "Бастапқысы"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Жаңа контакт қосу"
@@ -9379,6 +9684,16 @@ msgstr "_Ник аты:"
 msgid "_Group:"
 msgstr "_Тобы:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Пайдаланушы ID-і:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Ник аты"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9416,6 +9731,11 @@ msgstr ""
 "Бұл хаттамадан контактты қосу үшін сізге осы\n"
 "транспортқа байланыс орнату керек."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "Қалып-кү_й хабарламасын өзгерту"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Көңіл-күй:</b>"
@@ -9633,10 +9953,9 @@ msgstr "К_оманда орындау..."
 msgid "_Verify"
 msgstr "_Салыстыру"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Тіркелгілер"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b> ақпараты)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9663,11 +9982,6 @@ msgstr "Те_к белсенді контакттарды көрсету"
 msgid "Show Transports"
 msgstr "Транс_порттарды көрсету"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Файлдармен алмасу"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9738,35 +10052,25 @@ msgstr "Авто кір_генде қайыру"
 msgid "Pr_int status:"
 msgstr "Кү_йін шығару:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Сипаттамасы"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "Ақаулық жөнінде хаба_рлау"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Ол қатаң қате болмауы да мүмкін, бірақ сонда да жасаушыларға хабарлануы "
 "керек."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Жазылуға сұраным"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "Ақаулық жөнінде хаба_рлау"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Блоктау"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9774,16 +10078,11 @@ msgstr ""
 "Контакт сіздің желіде бар болуын білмеуі үшін оның авторизацияға сұранымын "
 "блоктаңыз"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "Әрек_ет"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "А_вторизация беру"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Контакт сіздің желіде бар болуын білуі үшін оны авторизациялаңыз"
 
@@ -9801,11 +10100,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Бар болу"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Достарды шақыру!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9814,15 +10113,20 @@ msgstr ""
 "Сіз көп пайдаланушы чатын бастауға дайынсыз.\n"
 "Шақырғыңыз келетін контакттарды таңдаңыз"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "MUC серверін таңдаңыз"
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC сервері"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Шақыру"
 
@@ -9942,11 +10246,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Тазалау"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10108,6 +10407,16 @@ msgstr "Қат_ыспаған оқиғаларды көрсету"
 msgid "Mute Sounds"
 msgstr "Дыбыстарды сөндіру"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Баптаулар"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Шығу"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Кімге:"
@@ -10502,14 +10811,6 @@ msgstr "Үстінен жазу керек пе?"
 msgid "Configuration"
 msgstr "Баптаулар"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM Клиенті"
@@ -10635,6 +10936,31 @@ msgid "Plugin manager"
 msgstr "Плагин сәтсіз"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP тіркелгісі %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Сипаттамасы"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>someone@somewhere.com</b> сіздің ростеріңізге бірнеше "
+#~ "контактты<b>қосқысы</b> келеді."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Көру үшін байланыс түрлерінің реттелген тізімі (арасы бос аралық). "
+#~ "Құрамында tls, ssl не plain бола алады"
+
+#~ msgid "_Actions"
+#~ msgstr "Әрек_ет"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "python-dbus талап етеді."
 
@@ -10835,12 +11161,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Hide all buttons in chat windows"
 #~ msgstr "Чат терезесіндегі барлық батырмаларды жасыру"
 
-#~ msgid "File is empty"
-#~ msgstr "Файл бос"
-
-#~ msgid "File does not exist"
-#~ msgstr "Файл жоқ"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10869,55 +11189,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "Python-pyopenssl талап етеді."
 
-#~ msgid "?user status:_Available"
-#~ msgstr "?user status:_Осында"
-
-#~ msgid "?user status:Available"
-#~ msgstr "?user status:Осында"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?контакт күйі:Белгісіз"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?контакт күйі:Қателері бар"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Subscription we already have:Жоқ"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Ask (for Subscription):Жоқ"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Group Chat Contact Role:Жоқ"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Group Chat Contact Affiliation:Жоқ"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Барлық"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Жоқ"
-
-#~ msgid "?features:Available"
-#~ msgstr "?features:Осында"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "тіркелгі"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "күйі"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "хабарлама"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "приоритет"
-
 #, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "бөлме"
@@ -10930,33 +11201,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "?CLI:password"
 #~ msgstr "пароль"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Чат бөлмелері"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Беру"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Тарату"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:Аялдатылған"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Клиент:Белгісіз"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?ОЖ:Белгісіз"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Уақыты:Белгісіз"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "?Role in Group Chat:<b>Ролі:</b>"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Хабарламаларды көрсету үшін D-Bus пен Notification-Daemon қолдану"
 
@@ -11165,9 +11409,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "Choose _Key..."
 #~ msgstr "_Кілтті таңдау..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "G_PG агентін қолдану"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11307,18 +11548,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML енгізу</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Фильтр:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML енгізу</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Жіберу"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "%s үшін XML консолі"
 
@@ -11806,9 +12035,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESession</b> ақпараты)"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "JID не контакт атын енгізіңіз"
 
@@ -11824,13 +12050,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "homepage url"
 #~ msgstr "үй парақ сілтемесі"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>someone@somewhere.com</b> сіздің ростеріңізге бірнеше "
-#~ "контактты<b>қосқысы</b> келеді."
-
 #~ msgid "More"
 #~ msgstr "Көбірек"
 
diff --git a/po/lt.po b/po/lt.po
index 94eb34c07..807185298 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-08-19 23:55+0200\n"
 "Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
 "Language-Team: Lithuanian <>\n"
@@ -26,20 +26,20 @@ msgstr ""
 msgid "Error."
 msgstr "Avahi error"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Tikrai siųsti failą?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -85,70 +85,70 @@ msgstr "Time"
 msgid "Progress"
 msgstr "Progress"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Size: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "You"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Atidaryti katalogą, kuriame yra failas"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Failo siuntimas sustabdytas"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -156,34 +156,34 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Choose File to Send..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Siųsti"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Aprašymas: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim cannot access this file"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -191,93 +191,93 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "What do you want to do?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Save File as..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Description: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Sending profile..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "File Transfer Error"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Invalid File"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "File: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Name: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Sender: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pause"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Tęsti"
 
@@ -431,42 +431,64 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Prisijungęs"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Savybė"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 msgid "Save Image as…"
 msgstr ""
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Turiu "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+#, fuzzy
+msgid "?Client:Unknown"
+msgstr "Klientas:"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr ""
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr ""
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr ""
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -475,7 +497,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -484,13 +506,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -498,27 +520,37 @@ msgid ""
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "You are waiting contact's answer about your subscription request"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "All files"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Failų siuntimai"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Proxi profilių valdymas"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -561,13 +593,13 @@ msgid "_New Group Chat"
 msgstr ""
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Ne Sąraše"
 
@@ -580,7 +612,7 @@ msgstr ""
 msgid "Send Single _Message…"
 msgstr "Siųsti Vieną Ži_nutę"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Siųsti _Parinktą Būklę"
@@ -598,25 +630,25 @@ msgstr "_Valdyti Pernašą"
 msgid "_Modify Transport"
 msgstr "_Keisti Pernašą"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Pervadinti"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "_Trinti"
@@ -630,207 +662,227 @@ msgstr "_Informacija"
 msgid "Send File..."
 msgstr "Siųsti _Failą..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kviesti Kontaktus"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "Įtr_aukti į kontaktų sąrašą"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Informacija"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Istorija"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Valdyti Kambarį"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Keisti _Temą..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Keisti Kambario Nustatymus..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 msgid "Destroy Room"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Keisti _Slapyvardį..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Žy_mės"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Balsas"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Nustatytos žinutės:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Vykdyti komandą"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Atsijungta"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Įtraukti asmenį..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "file"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Ieškoti Paslaugų"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "_Siųsti Žinutę..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Išplėstinis"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Nustatymai"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sinchronizuoti kontaktus"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Console"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Adminas"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Siųsti Žinutę Serveriui..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Nustatyti MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Atnaujinti MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Trinti MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "No such account available"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Prieiga"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "message"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Šyp_senėlės:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr ""
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr ""
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr ""
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr ""
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -839,97 +891,97 @@ msgid ""
 "In case you click YES, please wait…"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 msgid "Exporting History Logs…"
 msgstr ""
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr ""
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr ""
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "The service could not be found"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Atšaukti sutikimą"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Retrieving profile..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Asmens Informacija"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formatas: YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Information received"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Without a connection you can not publish your contact information."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Sending profile..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -947,10 +999,10 @@ msgstr "Contact name: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Bendros parinktys"
@@ -1037,36 +1089,36 @@ msgstr "Please fill in the data of the contact you want to add in account %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr ""
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "User ID:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Error while adding service. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1074,60 +1126,60 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "GTK+ Jabber klientas"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ Version:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK Version:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Current Developers:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Past Developers:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Last but not least, we would like to thank all the package maintainers."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Dictionary for lang %s not available"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1138,12 +1190,12 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Nesaugus ryšys"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1152,495 +1204,518 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Do _not ask me again"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr ""
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 msgid "The nickname contains invalid characters."
 msgstr ""
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Sutikimo užklausimas"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr ""
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Invalid File"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr ""
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Kurti naują pranešimą"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "MUC serveris"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "This is not a group chat"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Name"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Pokalbio tęsinys"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "New Group Chat"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Prijungti naują asmenį"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "New Message"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "New Single Message"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Single Message"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr ""
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+msgid "Clear"
+msgstr ""
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtras:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML Įvestis</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Siųsti"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Įtraukti"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Keisti"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Trinti"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr ""
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Įtraukti"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Keisti"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Trinti"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Grupės"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Įtr_aukti Kontaktą"
 msgstr[1] "Įtr_aukti Kontaktą"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Removes contact from roster"
 msgstr[1] "Removes contact from roster"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Nustatymai"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Jūs gavote naują įrašą:"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Avahi error"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Privatus sąrašas"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr ""
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr ""
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr ""
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr ""
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr ""
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr ""
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Images"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Choose Image"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "All files"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "Įveskite naują prieigos %s pavadinimą"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1664,325 +1739,362 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Adding Special Notification for %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Failų siuntimai"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Encryption disabled"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr ""
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr ""
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr ""
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr ""
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Invalid group chat Jabber ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "ir patvirtintas"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "ir NEpatvirtintas"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Pokalbis su "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Pokalbio tęsinys"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr ""
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr ""
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr ""
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr ""
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr ""
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr ""
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Failų siuntimai"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Failų siuntimai"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Rodyti formatavimo sąrašą"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Ši žinutė šifruota"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E šifravimas išjungtas"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -1990,7 +2102,7 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -1999,102 +2111,102 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s dabar %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Failų siuntimai"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Size: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Priimti"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Jungtis"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr ""
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Groupchats"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transports"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Authorisation has been sent"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Authorisation has been removed"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr ""
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2102,11 +2214,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2114,210 +2226,210 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Atšaukti failo siuntimą"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr ""
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr ""
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr ""
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr ""
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr ""
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr ""
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr ""
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr ""
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
 "always seeing you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in them always seeing you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr ""
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr ""
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr ""
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2325,182 +2437,182 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr ""
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Sends file to a contact"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr ""
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Keisti Būklės Žinutę"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr ""
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr ""
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Konfigūruoti Paslaugas..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr ""
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Visiems naudotojams"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Visiems prisijungusiems"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Pak_viesti į"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr ""
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Redaguoti _Grupes"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Trinti"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr ""
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr ""
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Istorija"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "History Manager"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Keisti Būklės Žinutę"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Rodyti tik kontaktų _sąrašą"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Išplėstinis konfigūracijos redaktorius"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kambario nustatymai"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Rodyti Visus Laukiančius Į_vykius"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "What do you want to do?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Jungiamasi"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Persiųsti neskaitytas žinutes"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2509,7 +2621,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2517,7 +2629,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2657,16 +2769,16 @@ msgstr "Account name is in use"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Password Required"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Save password"
 
@@ -2698,10 +2810,18 @@ msgstr "Pašalinti prieigą, _tik iš Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "All"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "None"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "New Group Chat"
@@ -2764,11 +2884,11 @@ msgstr "Invalid entry"
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr ""
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2864,90 +2984,113 @@ msgstr "Group Chat Message Highlight"
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s of this group chat"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "None"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Member"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Owner"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Prisijungta"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Atsijungta"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+msgid "?Noun:Download"
+msgstr ""
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Group Chats"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr ""
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr ""
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr ""
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr ""
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr ""
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+#, fuzzy
+msgid "?transfer status:Paused"
+msgstr "All"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr ""
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr ""
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "All"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Laisvas Pokalbiams"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Manęs nėra"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Užimtas"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Esu išėjęs"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Atsijungęs"
 
@@ -2996,125 +3139,129 @@ msgstr "(None)"
 msgid "Hidden"
 msgstr "Hidden"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr ""
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Pokalbio istorija"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Keisti Būklės Žinutę"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr ""
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Žymių valdymas"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "_sąraše"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Rodyk _Kontaktų Sąrašą"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Unable to load idle module"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nematomumo funkcijos nėra"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Serverio adresas: "
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Serverio teikiamos paslaugos"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Serveris atsakė: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3270,57 +3417,63 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Cituoti"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Invalid JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3332,30 +3485,35 @@ msgstr[1] "Yesterday"
 msgid "Write a message.."
 msgstr "New Private Message"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr ""
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr ""
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Group Chats"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Messages"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3364,270 +3522,275 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr ""
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr ""
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Šriftas</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Jūs esate išmestas iš grupės pokalbio %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Group chat creation is restricted."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Unable to join group chat"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr ""
 "Jūsų užregistruotas slapyvardis turi būti naudojamas grupės pokalbyje %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Jūs estate grupės pokalbio %s narių sąraše."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr ""
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Sutikimo užklausimas"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observers"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr ""
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Save passphrase"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "OpenPGP passphrase was not given"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Passphrase Required"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Enter your password for account %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Failų siuntimai"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Choose File to Send..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Nepavyko iškoduoti žinutės"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3635,7 +3798,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3645,15 +3808,15 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3668,44 +3831,44 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "This is not a group chat"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr ""
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3713,41 +3876,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "įprastas"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "OpenPGP Key Selection"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
@@ -3817,6 +3980,11 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3847,7 +4015,7 @@ msgstr "Invalid File"
 msgid "The form is not filled correctly."
 msgstr ""
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Nematomas"
 
@@ -3977,6 +4145,56 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Could not start local service"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Could not load image"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Could not load image"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Encryption enabled"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Connection not available"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Theme"
@@ -4002,7 +4220,16 @@ msgstr "You cannot delete your current theme"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Apjungtos prieigos"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr ""
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Be right back."
 
@@ -4024,6 +4251,11 @@ msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Trinti"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4217,62 +4449,82 @@ msgstr "Keisti slaptažodį"
 msgid "Login Options"
 msgstr "Šyp_senėlės:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus is not present on this machine or python module is missing"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "command"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "show help on command"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "account"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "status message"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4280,22 +4532,27 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "_Prioritetas:"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr ""
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4305,29 +4562,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "message contents"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4337,119 +4594,119 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "subject"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "message subject"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "file"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "File path"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "key"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML to send"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4458,16 +4715,16 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Change status"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr ""
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4476,19 +4733,19 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr ""
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4497,31 +4754,31 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4532,14 +4789,14 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4711,11 +4968,6 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP prieiga %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4739,52 +4991,52 @@ msgstr "Kambarys buvo sunaikintas"
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Not in roster"
 
@@ -5543,75 +5795,73 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5619,180 +5869,190 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Jei pažymėta, Gajim leis kitiems matyti kokią operacijų sistemą naudojate"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s wants to send you a file."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anoniminė autentikaciją"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anoniminė autentikacija"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anoniminė autentikacija"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Back soon"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Movie"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "I'm working."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Phone"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Out"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "I'm available."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Bye!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -5800,27 +6060,27 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "human"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Kam"
@@ -5899,37 +6159,51 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr "Persiųsti neskaitytas žinutes"
 
+#: gajim/common/httpupload.py:137
+#, fuzzy
+msgid "File is empty"
+msgstr "File path"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr ""
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "creating logs database"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Pak_viesti į"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is a file but it should be a directory"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
@@ -5939,11 +6213,11 @@ msgstr "%s is a directory but should be a file"
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -5952,234 +6226,234 @@ msgstr "migrating logs database to indices"
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Nepavyksta iškoduoti siuntėjo viešojo rakto"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Blogas CA sertifikatas"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Serveris %(name)s atsiuntė blogą atsakymą į registravimo užklausą: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Could not connect to \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Could not connect to \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serveris atsakė: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Nepavyko prisijungti prie proksi"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nepavyko prisijungti prie %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Prarastas ryšys su %s. Jungiamasi iš naujo."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Siųsti kontaktus:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
@@ -7045,181 +7319,206 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr ""
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr ""
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr ""
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr ""
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Užimtas"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Nepasiekiamas"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Laisvas Pokalbiams"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "_Prisijungęs"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Nuėjęs"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "A_tsijungęs"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "N_ematomas"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Būklė nežinoma"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Būklė klaidinga"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Joks"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Kam"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Nuo"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Abu"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Joks"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "None"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderators"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Participants"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Participant"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Visitors"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Visitor"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "is composing a message..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d žinutė laukia"
 msgstr[1] "%d žinutės laukia"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, python-format
 msgid "from room %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr ""
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "Nuo"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7227,73 +7526,73 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr ""
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr ""
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Unable to load idle module"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "message"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
@@ -7328,43 +7627,43 @@ msgstr ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7606,6 +7905,11 @@ msgstr "_Banas"
 msgid "_Add to Roster"
 msgstr "Įtr_aukti į kontaktų sąrašą"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Vykdyti komandą"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -7888,11 +8192,11 @@ msgstr "Apie"
 msgid "Con_tinue"
 msgstr "_Tęsti"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pauzė"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Atšaukti"
@@ -7901,31 +8205,31 @@ msgstr "_Atšaukti"
 msgid "_Open Containing Folder"
 msgstr "_Atidaryti katalogą, kuriame yra failas"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Failų siuntimai"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "failų siuntimų sąrašas"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Sąrašas aktyvių, baigtų ar sustabdytų failų siuntimų"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Išvalyti"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Pašalinti užbaigtus, atšauktus ir lūžusius failų siuntimus iš sąrašo"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Pašalinti failo siuntimą iš sąrašo."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -7933,32 +8237,37 @@ msgstr ""
 "Šis veiksmas pašalins vieną failo siuntimą iš sąrašo. Jei failo siuntimas "
 "yra aktyvus, jis iš pradžių bus sustabdytas ir tada ištrintas"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Atšaukti pažymėtų failų siuntimą ir ištrinti nepilnus failus"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Atšaukti failo siuntimą"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Atšaukti pažymėtų failų siuntimą"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Išsiųsti "
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Slėpti langą"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Pranešti, kai failo siuntimas bus baigtas"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Rodyti failų siuntimų sąrašą tarp jūsų ir kitų"
 
@@ -7967,7 +8276,7 @@ msgid "Register to"
 msgstr "Registruotis prie"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -7998,21 +8307,21 @@ msgstr "Šriftas"
 msgid "Clear formatting"
 msgstr "Valyti formatavimą"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Choose File to Send..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Event"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Įvykiai"
@@ -8075,7 +8384,7 @@ msgstr "<b>Šriftas</b>"
 msgid "<b>#</b>"
 msgstr "<b>Šriftas</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -8812,10 +9121,6 @@ msgstr "_Atidaryti..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Išplėstinis konfigūracijos redaktorius</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Išplėstinis"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Pradėti _Pokalbį"
@@ -9055,7 +9360,7 @@ msgid "_Open Email Composer"
 msgstr "_Atidaryti el. pašto programą"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Pradėti pokalbį"
 
@@ -9100,6 +9405,10 @@ msgstr "Parinktys"
 msgid "Default:"
 msgstr "Default"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Prijungti naują asmenį"
@@ -9125,6 +9434,16 @@ msgstr "_Slapyvardis:"
 msgid "_Group:"
 msgstr "_Grupė:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "User ID:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Slapyvardis:"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9163,6 +9482,11 @@ msgstr ""
 "Kad galėtumėte pridėti asmenį iš šio protokolo, turite\n"
 "būti prisijungęs prie perlaidos."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Keisti Būklės Žinutę"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Nuotaika:</b>"
@@ -9387,10 +9711,10 @@ msgstr "_Vykdyti komandą..."
 msgid "_Verify"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Prieiga"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Aprašymas</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9417,11 +9741,6 @@ msgstr "Rodyti Tik _Aktyvius Kontaktus"
 msgid "Show Transports"
 msgstr "Rodyti _Pernašas"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Failų siuntimai"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9494,31 +9813,21 @@ msgstr ""
 msgid "Pr_int status:"
 msgstr "Rodyti būklę:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Description"
-
-#: gajim/data/gui/exception_dialog.ui:44
-msgid "Report Bug"
-msgstr ""
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Sutikimo užklausimas"
+#: gajim/data/gui/exception_dialog.ui:115
+msgid "Report Bug"
+msgstr ""
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Drausti"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9526,16 +9835,11 @@ msgstr ""
 "Drausti autorizacija šiam asmeniui, jis arba ji negalės matyti ar esate "
 "prisijungęs"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Veiksmai"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_torizuoti"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autorizuoti asmenį, kad jis arba ji žinotu kada esate prisijungęs"
 
@@ -9553,26 +9857,31 @@ msgstr ""
 msgid "Presets"
 msgstr "_Buvimas"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "Pažymėkite kontaktus kuriuos norėsite sinchronizuoti"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC serveris"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Pak_viesti"
 
@@ -9686,10 +9995,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-msgid "Clear"
-msgstr ""
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -9852,6 +10157,16 @@ msgstr "Rodyti Visus Laukiančius Į_vykius"
 msgid "Mute Sounds"
 msgstr "Išjungti Garsus"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Parinktys"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Išjungti"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Kam:"
@@ -10253,14 +10568,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Kambario nustatymai"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klientas"
@@ -10385,6 +10692,17 @@ msgid "Plugin manager"
 msgstr "Registracija nesėkminga"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP prieiga %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Description"
+
+#~ msgid "_Actions"
+#~ msgstr "_Veiksmai"
+
+#, fuzzy
 #~ msgid "Start Chat..."
 #~ msgstr "_Pradėti pokalbį..."
 
@@ -10455,9 +10773,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Wrong URI"
 #~ msgstr "Wrong host"
 
-#~ msgid "Nickname:"
-#~ msgstr "Slapyvardis:"
-
 #~ msgid "Server:"
 #~ msgstr "Serveris:"
 
@@ -10526,58 +10841,6 @@ msgstr "Registracija nesėkminga"
 #~ "avatar last time or has one cached that is too old."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "_Prisijungęs"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "All"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Būklė nežinoma"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Būklė klaidinga"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Joks"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Joks"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "None"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "None"
-
-#~ msgid "?print_status:All"
-#~ msgstr "All"
-
-#~ msgid "?print_status:None"
-#~ msgstr "None"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Prisijungęs"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "account"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "message"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "_Prioritetas:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "room"
 
@@ -10589,10 +10852,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "?CLI:password"
 #~ msgstr "password"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Group Chats"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Use D-Bus and Notification-Daemon to show notifications"
 
@@ -10878,18 +11137,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML Įvestis</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtras:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML Įvestis</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Siųsti"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML Console for %s"
 
@@ -11702,12 +11949,6 @@ msgstr "Registracija nesėkminga"
 #~ "Usage: /%s <action>, sends action to the current group chat. Use third "
 #~ "person. (e.g. /%s explodes.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Encryption enabled"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Encryption disabled"
-
 #~ msgid "Click to see past conversation in this room"
 #~ msgstr "Spauskite, kad pamatytumėte buvusius pokalbius šiame kambaryje"
 
@@ -11825,9 +12066,6 @@ msgstr "Registracija nesėkminga"
 #~ msgid "Ask:"
 #~ msgstr "Klausti:"
 
-#~ msgid "Client:"
-#~ msgstr "Klientas:"
-
 #~ msgid "OS:"
 #~ msgstr "OS:"
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 6cadfab18..9419a364b 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: <>\n"
@@ -25,20 +25,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Feil."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -95,70 +95,70 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Du"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Fil overføring avbrutt"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottaker:  %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Fil overføring stoppet"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -166,34 +166,34 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Velg Fil for Sending..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Send"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Beskrivelse:"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -201,93 +201,93 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive den."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Lagre Fil som..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Sender profil..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Fil Overføring Feilet"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Fil: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Navn: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pause"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -446,43 +446,64 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Krever python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Tilgjengelig"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Funksjonalitet"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Feil under traversering av fil:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Bilde kan ikke lagres i %(type)s format. Lagre som %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Lagre Bilde som..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Har"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Client:Ukjent"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Ukjent"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Time:Ukjent"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -491,7 +512,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -500,13 +521,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -514,27 +535,37 @@ msgid ""
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Alle filer"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Vasker"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Behandle Proxy Profiler"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -577,13 +608,13 @@ msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Ikke i kontaktliste"
 
@@ -596,7 +627,7 @@ msgstr "Jeg ønsker å legge deg til min kontaktliste"
 msgid "Send Single _Message…"
 msgstr "Send _Melding"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
@@ -614,25 +645,25 @@ msgstr "_Behandle Transporter"
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Gi Nytt Navn"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Frigi"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Blokker"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "_Fjern"
@@ -646,209 +677,229 @@ msgstr "_Informasjon"
 msgid "Send File..."
 msgstr "Send _Fil..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Inviter _Kontakter"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Informasjon"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historie"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Behandle Rom"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Endre _Tittel..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Konfigurer _Rom..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Ødelegg Rom"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Endre _Kallenavn..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Bokmerke dette rommet"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Stemme"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Forvalgte meldinger:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimer ved lukking"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Kjør Kommando"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Koble ifra"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Legg til Kontakt..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "fil"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "_Send Enkeltmelding..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avansert"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Instillinger"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synkroniser"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Admin"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Send Server Melding..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Sett MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Oppdater MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Slett MFD (MOTD)"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Ingen konto tilgjengelig"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Kontoer"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "melding"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Uttrykksikoner:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Dato"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Melding"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Tittel"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Ønsker du å rengjøre databasen? (STERKT FRARÅDET MENS GAJIM KJØRER)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -863,99 +914,99 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Database feil"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Eksporterer Historiske Logger..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Ønsker du virkelig å slette den valgte meldingen?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Ønsker du virkelig å slette loggene til den valgte kontakten?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Tjenesten ble ikke funnet"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Henter profil..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktinformasjon"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informasjon motatt"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Sender profil..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informasjon IKKE publisert"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -973,10 +1024,10 @@ msgstr "Kontakt navn: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Generelle"
@@ -1066,36 +1117,36 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Feil ved tilføying av tjeneste. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1103,60 +1154,60 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "En GTK+ Jabber klient"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ Versjon:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK Versjon:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Nåværende Utviklere:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Tidligere Utviklere:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Sist men ikke minst ønsker vi å takke alle de som lager installasjonspakker."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1169,12 +1220,12 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1186,498 +1237,521 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker å koble til usikkert"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Abonnerings Forespørsel"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings forespørsel for konto %(account)s fra %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Bli med i Gruppesamtale"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Ugyldig rom"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Vennligst lag et nytt rent tema med ditt ønskede navn."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Feil uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Navn"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan ikke synkronisere med en konto uten å være tilkoblet."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Fortsettende samtale"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Ny Gruppesamtale"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Legg til ny Kontakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Ny Melding"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Ny Melding"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Melding"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Skjema %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Det er ikke mulig å sende en melding til %s, JID er ikke gyldig."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Vasker"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filter:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML Input</b>"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Send"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Lei seg"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Endre"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%s</b> ønsker at du <b>%s</b> noen kontakter i kontaktlisten. "
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Legg til"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Endre"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Slett"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Grupper"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s anbefalte meg å legge til deg i min kontaktliste. "
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "_Legg til kontakt"
 msgstr[1] "_Legg til kontakt"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Fjerner kontakt fra kontaktlisten"
 msgstr[1] "Fjerner kontakt fra kontaktlisten"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Instillinger"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Tjenesten returnerte en feil."
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Feil"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rekkefølge:  %(order)s, handling: %(action)s, type: %(type)s, verdi: "
 "%(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive et navn for å lage en liste over uønskede."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Bilder"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Velg Bilde"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Alle filer"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "for kontoen %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1701,68 +1775,96 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL sertifikats validering"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Fil Overføringer"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Kryptering avslått"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nå kjent som %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke lenger i samtalerommet \"%(room)s\" eller \"%(nick)s\" har dratt."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Metakontakter lagring støttes ikke av din server"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1771,252 +1873,262 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "og autentisert"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "og IKKE autentisert"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s har satt tittel til %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Romet er nå full-anonymisert"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har satt eller endret ditt rom kallenavn"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilknytning for %(nick)s har blitt satt til %(affiliation)s av %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilknutning for %(nick)s har blitt satt til %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s av %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av samtalerommet \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Dersom du lukker dette vinduet, så vil du bli koblet fra dette samtalerommet."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Fil Overføringer"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Fil Overføringer"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Vis en liste over formatteringer"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Denne kontakten støtter ikke filoverføring."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sesjonen VIL IKKE bli logget"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2024,16 +2136,16 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2041,7 +2153,7 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2050,7 +2162,7 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2059,98 +2171,98 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Fil Overføringer"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Størrelse: "
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Godkjenn"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Bli med"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Kontakten stoppet overføring"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Feil under åpning av fil"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transporter"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG fungerer ikke"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2158,11 +2270,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2170,38 +2282,38 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Virkelig avslutte Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på at du vil avslutte Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Alltid lukk Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Avbryt filoverføring"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2209,16 +2321,16 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått og kontakten er i kontaktlisten."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2226,11 +2338,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2239,12 +2351,12 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å blokkere en kontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2253,57 +2365,57 @@ msgstr ""
 "Denne kontakten vil se deg som frakoblet og du vil ikke motta meldinger han "
 "sender deg."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ønsker du å fjerne gruppen %s fra kontaktlisten?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Også fjerne alle kontakter i denne gruppen fra kontaktlisten"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Du er i ferd med å fjerne \"%(name)s\" (%(jid)s) fra din kontaktliste.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2313,11 +2425,11 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2326,15 +2438,15 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2344,7 +2456,7 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -2352,7 +2464,7 @@ msgstr ""
 "Du skal til å sende en individuell status. Er du sikker på at du ønsker å "
 "fortsette?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2361,24 +2473,24 @@ msgstr ""
 "Denne kontakten vil midlertidig se deg som %(status)s, men bare til du "
 "endrer status igjen. Da vil han se din nye globale status. "
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du må lage en konto før du kan snakke med andre kontakter."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2387,13 +2499,13 @@ msgstr ""
 "Din server støtter ikke lagring av metakontakt informasjon, så denne "
 "informasjonen vil ikke bli lagret til neste tilkobling."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2403,195 +2515,195 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Ønsker du å sende denne filen til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Send %s til %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Gjør %s og %s metakontakter"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publiser Sang"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Konfigurer Tjenester..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Rediger _Grupper"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Koble til på nytt"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historie"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Endre Status Melding"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Vis bare i _kontaktliste"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Avansert Konfigurasjons Editor"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Rom Instillinger"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Configure logging system"
 msgstr "_Konfigurer"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Database feil"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kobler til"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Videresend uleste meldinger"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2600,7 +2712,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2608,7 +2720,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2754,16 +2866,16 @@ msgstr "Uttryksikoner avslått"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Lagre passord"
 
@@ -2795,10 +2907,18 @@ msgstr "Fjern kontoe _bare fra Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Alle"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Ingen"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
@@ -2863,11 +2983,11 @@ msgstr "Ugyldig innlegg"
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2972,90 +3092,113 @@ msgstr "Gruppe Samtale Melding Utheving"
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av denne samtalegruppen"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Ingen"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Medlem"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Eier"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [blokkert]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [minimert]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Last ned"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Last opp"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Type: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Komplett"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:Pauset"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Henger"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Overfører"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?transfer status:Pauset"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Borte"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Opptatt"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Frakoblet"
 
@@ -3104,125 +3247,129 @@ msgstr "(Ingen)"
 msgid "Hidden"
 msgstr "Gjemt"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Disk Feil"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Feil"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Endre Status Melding"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Behandle Bokmerker"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktliste"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Usynlighet ikke støttet"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Maskinnavn:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Server Funksjonalitet"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Servern svarte: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3380,7 +3527,7 @@ msgstr "_Abonnér"
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3388,51 +3535,57 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt\n"
 "siden sist du fulgte med i denne gruppe samtalen"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Sitat"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Ugyldig JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3444,30 +3597,35 @@ msgstr[1] "I går"
 msgid "Write a message.."
 msgstr "Ny Privat Melding"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Du kommer til å lukke flere tabber"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Ønsker du virkelig å lukke alle?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Gruppe Samtaler"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Meldinger"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3479,108 +3637,108 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Alltid bruk dette kallenavnet når det er en konflikt"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Et passord kreves for å bli med i rommet %s. Vennligst skriv det."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Font</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Abonnerings forespørsel"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observerere"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3589,31 +3747,31 @@ msgstr ""
 "Du vil alltid se han eller henne som frakoblet.\n"
 "Ønsker du å fjerne han eller henne fra din kontakt liste?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Fjern Abonnement"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3622,36 +3780,36 @@ msgstr ""
 "Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
 "som kjører eller den returnerte feil passord frase.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Feil Passordsetning"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Feil Passordsetning"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Sertifikatet har utløpt"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3660,77 +3818,82 @@ msgstr ""
 "GPG nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
 "virkelig å kryptere denne meldingen?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Fil Overføringer"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Velg Fil for Sending..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3738,21 +3901,21 @@ msgstr ""
 "Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
 "et annet"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s ønsker å sende deg en fil."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3763,7 +3926,7 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3776,15 +3939,15 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3805,7 +3968,7 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3814,7 +3977,7 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3823,16 +3986,16 @@ msgstr ""
 "Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
 "at du ønsker å gjøre det?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3840,7 +4003,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3849,11 +4012,11 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3861,41 +4024,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "standard"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG nøkkel utgått"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG nøkkel er utgått, du vil bli koblet til %s uten OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
@@ -3966,6 +4129,11 @@ msgstr "- meldinger vil bli logget"
 msgid "- messages will not be logged"
 msgstr "- -meldinger vil ikke bli logget"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3997,7 +4165,7 @@ msgstr "Ugyldig rom"
 msgid "The form is not filled correctly."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -4128,6 +4296,57 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Kunne ikke starte lokal tjeneste"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Kunne ikke laste bilde"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Tjenesten returnerte en feil."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Kunne ikke laste bilde"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Kryptering påslått"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Tilkobling ikke tilgjengelig"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4153,7 +4372,17 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Samlede kontoer"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Bruk G_PG Agent"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Snart tilbake."
 
@@ -4176,6 +4405,11 @@ msgstr "Du har åpne samtaler på konto %s"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Fjern"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4369,51 +4603,65 @@ msgstr "Endre Passord"
 msgid "Login Options"
 msgstr "_Uttrykksikoner:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Vis hjelp for en spesifisert kommando"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "kommando"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Spretter opp et nytt vindu med den neste ventende hendelsen"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "konto"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Endrer status på konto eller kontoer"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4422,11 +4670,17 @@ msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "melding"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "status melding"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4434,16 +4688,21 @@ msgstr ""
 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Endrer prioritet på konto eller kontoer"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritet"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "prioritet du ønsker å gi til kontoen"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4451,7 +4710,7 @@ msgstr ""
 "endre prioritet til en konto. Dersom uspesifisert, endre status til alle "
 "kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4461,30 +4720,30 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4494,122 +4753,122 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "tittel"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sender nye meldinger to en gruppesamtale som du er tilkoblet."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "fil"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Fil sti"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'nøkkel' er navnet på innstillingen, 'verdi' er gjeldende innstilling"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "nøkkel"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer innstillinger (globale innstillinger om ikke en konto er "
 "spesifisert)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4618,17 +4877,17 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Endre status"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Kallenavn å bruke"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4637,19 +4896,19 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4658,15 +4917,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ut som Gajim ikke kjører, så du kan ikke bruke gajim-remote. "
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4675,16 +4934,16 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4695,7 +4954,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4704,7 +4963,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4878,11 +5137,6 @@ msgstr "Slutten av uken"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP konto %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4907,52 +5161,52 @@ msgstr "Rommet har blitt ødelagt"
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra gruppesamtalerom %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Melding fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
@@ -5778,22 +6032,18 @@ msgstr "Aktiver ESessions kryptering for denne kontoen."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en kryptert sesjon når mulig?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. Kan "
-"inneholde tls, ssl eller plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5801,48 +6051,48 @@ msgid ""
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Vis en advarsels dialog før bruk av standard SSL bibliotek."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Mellomrom sendt etter inaktivitet"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sendt etter inaktivitet"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5851,11 +6101,11 @@ msgstr ""
 "Hvor mange sekunder skal man vente på svar fra ping alive pakker før vi "
 "prøver å koble til på nytt."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5863,21 +6113,21 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5885,12 +6135,12 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s ønsker å sende deg en fil."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5898,53 +6148,63 @@ msgstr ""
 "Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
 "meldinger skal logges?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anonym autentisering"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anon_ym autentisering"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anon_ym autentisering"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
@@ -5952,7 +6212,7 @@ msgid ""
 msgstr ""
 "Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
@@ -5961,90 +6221,90 @@ msgstr ""
 "Hvor mange minutter med logg skal man be om når man går inn i en "
 "gruppesamtale. "
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Jobber"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Ute"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6053,27 +6313,27 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "grønn"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "varehandel"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "menneskelig"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Til"
@@ -6152,37 +6412,50 @@ msgstr "Alle uleste meldinger har blitt videresendt."
 msgid "Forward unread message then disconnect"
 msgstr "Videresend uleste meldinger"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Filen er tom"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Filen finnes ikke"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "lager logg database"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Send %s til %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s er en fil men skulle ha vært en katalog"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er en katalog men skulle vært en fil"
@@ -6192,11 +6465,11 @@ msgstr "%s er en katalog men skulle vært en fil"
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "turkis"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
@@ -6205,188 +6478,188 @@ msgstr "migrerer logg databaser til indekser"
 msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldig loggnivå"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til å få utsteders sertifikat"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til å skaffe sertifikatets CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til å dekryptere sertifikatets signatur"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til å dekryptere CRLens signatur"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Klarer ikke å dekode usteders offentlige nøkkel"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Sertifikat signatur feil"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "CRL signatur feil"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Sertifikatet er ikke gylig enda"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Sertifikatet har utløpt"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL er ikke gyldig enda"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL har utgått"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Formaterings feil i sertifkatets notBefore felt"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Formaterings feil i sertifikatets notAfter felt"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formaterings feil i CRLens lastUpdate felt"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formaterings feil i CRLens nextUpdate felt"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Selvsignert sertifikat"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsignert sertifikat i sertifikats kjeden"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Ute av stand til å få tak i lokal utsteders sertifikat"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Ute av stand til å verifisere det første sertifikatet"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Sertifikats kjeden er for lang"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Sertifikat tilbakekallt"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA sertifikat"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Stilengde begrensning overskredet"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Ikke støttet sertifkats hensikt"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Sertifikatet er ikke tiltrodd"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Sertifikatet avvist"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Tittel utsteder passer ikke"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og tittel nøkkel identifikator passer ikke"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og utsteder seriernummer passer ikke"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarte: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Tilkobling til konto %s har blitt mistet. Prøv igjen."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6395,7 +6668,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6404,38 +6677,38 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Sendt kontakter:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
@@ -7306,255 +7579,280 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?transfer status:Pauset"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "B_orte"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?contact has status:Ukjent"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?contact has status:Har feilmeldinger"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Ingen"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Til"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Fra"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Begge"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Ingen"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Deltakere"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Deltaker"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Besøk"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "skriver en melding..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "fra rom %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "fra bruker %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "fra %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hendelse venter"
 msgstr[1] "%d hendelser venter"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL er ikke gyldig enda"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "melding"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
@@ -7590,43 +7888,43 @@ msgstr ""
 "Sesjons bussen er ikke tilgjengelig.\n"
 "Prøv å les http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7872,6 +8170,11 @@ msgstr "_Utvis"
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Kjør Kommando"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8154,11 +8457,11 @@ msgstr "Om"
 msgid "Con_tinue"
 msgstr "_Fortsett"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pause"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -8167,31 +8470,31 @@ msgstr "_Avbryt"
 msgid "_Open Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Fil Overføringer"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "fil overførings liste"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "En liste over aktive, komplette og stoppede fil overføringer"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Rydd _opp"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Fjerner komplette, avbrutte og feilede filoverføringer fra listen"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverføringen fra listen"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8199,32 +8502,37 @@ msgstr ""
 "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil "
 "den først bli stoppet og så fjernet."
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Avbryter valgte filoverføring og fjerner den uferdige filen"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Avbryt filoverføring"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Avbryter valgte filoverføring"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Send & Lukk"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Lukker vinduet"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Viser en liste over overføringer mellom deg og andre"
 
@@ -8233,7 +8541,7 @@ msgid "Register to"
 msgstr "Registrer til:"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8264,21 +8572,21 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Fjern formattering"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Vis en liste over uttrykksikon (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Velg Fil for Sending..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Vis en liste over uttrykksikon (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Hendelse"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Hendelser"
@@ -8341,7 +8649,7 @@ msgstr "<b>Font</b>"
 msgid "<b>#</b>"
 msgstr "<b>Font</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9101,10 +9409,6 @@ msgstr "_Åpne..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editering av Avanserte Instillinger</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avansert"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Start _Samtale"
@@ -9346,7 +9650,7 @@ msgid "_Open Email Composer"
 msgstr "_Åpne ny Epost"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
@@ -9391,6 +9695,10 @@ msgstr "Tilstedeværelse"
 msgid "Default:"
 msgstr "Standard"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Legg til ny Kontakt"
@@ -9416,6 +9724,16 @@ msgstr "_Kallenavn:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Bruker ID:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Kallenavn"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9454,6 +9772,11 @@ msgstr ""
 "Du må være koblet til transporten for å kunne\n"
 "legge til en kontakt fra denne protokollen."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Endre Status Melding"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Stemning:</b>"
@@ -9679,10 +10002,9 @@ msgstr "_Kjør Kommando"
 msgid "_Verify"
 msgstr "_Verifiser"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Kontoer"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESesjon</b> informasjon)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9709,11 +10031,6 @@ msgstr "Vis Bare _Aktive Kontakter"
 msgid "Show Transports"
 msgstr "Vis Trans_porter"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Fil Overføringer"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9787,35 +10104,25 @@ msgstr "Minimer ved Automatisk Deltakelse"
 msgid "Pr_int status:"
 msgstr "Skriv status:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Beskrivelse"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Rapporter Feil"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Det er sannsynligvis ikke kritisk, men bør rapporteres til utviklerene "
 "likevel."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Abonnerings Forespørsel"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Rapporter Feil"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9823,16 +10130,11 @@ msgstr ""
 "Avslå godkjenning fra kontakt så han eller henne ikke kan se når du er "
 "tilkoblet"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Handlinger"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Go_dkjenn"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Godkjenn kontakt så han eller hun kan vite når du er tilkoblet"
 
@@ -9850,11 +10152,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Tilstedeværelse"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Inviter Venner!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9863,15 +10165,20 @@ msgstr ""
 "Du kommer nå til å starte en Fler-Bruker Samtale.\n"
 "Velg kontaktene du ønsker å invitere"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Vennligst velg en MUC server."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC server"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_viter"
 
@@ -9991,11 +10298,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Vasker"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10157,6 +10459,16 @@ msgstr "Vis Alle _Handlinger som Venter"
 msgid "Mute Sounds"
 msgstr "Slå av Lyder"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Tilstedeværelse"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Avslutt"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Til:"
@@ -10564,14 +10876,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Rom Instillinger"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM Klient"
@@ -10696,6 +11000,31 @@ msgid "Plugin manager"
 msgstr "Registrering feilet"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP konto %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Beskrivelse"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>noen@etsted.no</b> ønsker at du skal <b>legge til</b> noen kontakter i "
+#~ "kontaktlisten din."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. "
+#~ "Kan inneholde tls, ssl eller plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Handlinger"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Krever python-dbus."
 
@@ -10895,12 +11224,6 @@ msgstr "Registrering feilet"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Bruk: /%s, gjemmer samtale knappene."
 
-#~ msgid "File is empty"
-#~ msgstr "Filen er tom"
-
-#~ msgid "File does not exist"
-#~ msgstr "Filen finnes ikke"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10930,58 +11253,6 @@ msgstr "Registrering feilet"
 #~ msgstr "Krever python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?transfer status:Pauset"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?transfer status:Pauset"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?contact has status:Ukjent"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?contact has status:Har feilmeldinger"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Subscription we already have:Ingen"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Ask (for Subscription):Ingen"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Group Chat Contact Role:Ingen"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Group Chat Contact Affiliation:Ingen"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Alle"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Ingen"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Tilgjengelig"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "konto"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "melding"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "prioritet"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "rom"
 
@@ -10993,30 +11264,6 @@ msgstr "Registrering feilet"
 #~ msgid "?CLI:password"
 #~ msgstr "passord"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Gruppe Samtaler"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Last ned"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Last opp"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:Pauset"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Client:Ukjent"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Ukjent"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Time:Ukjent"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
 
@@ -11221,9 +11468,6 @@ msgstr "Registrering feilet"
 #~ msgid "Choose _Key..."
 #~ msgstr "Velg _Nøkkel..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Bruk G_PG Agent"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11350,17 +11594,6 @@ msgstr "Registrering feilet"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML Input</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filter:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML Input</b>"
-
-#~ msgid "Send"
-#~ msgstr "Send"
-
 #~ msgid "Show _XML Console"
 #~ msgstr "Vis _XML Konsoll"
 
@@ -11756,9 +11989,6 @@ msgstr "Registrering feilet"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESesjon</b> informasjon)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Kontakt navn"
@@ -11771,13 +12001,6 @@ msgstr "Registrering feilet"
 #~ msgid "All Chat Histories"
 #~ msgstr "Gamle historier"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>noen@etsted.no</b> ønsker at du skal <b>legge til</b> noen kontakter i "
-#~ "kontaktlisten din."
-
 #~ msgid "More"
 #~ msgstr "Mer"
 
@@ -12703,9 +12926,6 @@ msgstr "Registrering feilet"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
@@ -12755,12 +12975,6 @@ msgstr "Registrering feilet"
 #~ "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
 #~ "tredje person. (f.eks. /%s explodes.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Kryptering påslått"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Kryptering avslått"
-
 #~ msgid "_Retype Password:"
 #~ msgstr "_Repeter Passord:"
 
diff --git a/po/nl.po b/po/nl.po
index 6ff419f84..7d1d35a49 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2015-04-24 00:10+0100\n"
 "Last-Translator: Nathan Follens <nthn@unseen.is>\n"
 "Language-Team: none\n"
@@ -28,20 +28,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Fout."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Bestand versturen?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Als je een bestand naar %s stuurt zal hij/zij je echte Jabber-ID zien."
@@ -96,69 +96,69 @@ msgstr "Duur"
 msgid "Progress"
 msgstr "Voortgang"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Bestandsnaam: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Grootte: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Jij"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Afzender: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Opgeslagen in: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Bestandsoverdracht afgerond"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 msgid "Open _Containing Folder"
 msgstr "_Bovenliggende map openen"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Bestandsoverdracht geannuleerd"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Kon geen verbinding maken met gebruiker."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Ontvanger: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Foutbericht: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Bestandsoverdracht gestopt"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -168,32 +168,32 @@ msgstr ""
 "Het bestand %(file)s is ontvangen, maar lijkt onderweg beschadigd te zijn.\n"
 "Wil je het opnieuw downloaden?"
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 msgid "Choose File to Send…"
 msgstr "Kies het bestand om te verzenden…"
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "Ver_zenden"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Beschrijving: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 msgid "Gajim can not read this file"
 msgstr "Gajim kan dit bestand niet lezen"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr "Dit bestand is in gebruik door een ander proces."
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan bestaand bestand ‘%s’ niet overschrijven"
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -201,90 +201,90 @@ msgstr ""
 "Een bestand met deze naam bestaat al en je hebt geen toestemming om het te "
 "overschrijven."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Wat wil je doen?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Map ‘%s’ is niet schrijfbaar"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Je hebt geen toestemming om bestanden aan te maken in deze map."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 msgid "Save File as…"
 msgstr "Bestand opslaan als…"
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Bestand: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 msgid "Checking file…"
 msgstr "Bestand wordt gecontroleerd…"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 msgid "File error"
 msgstr "Bestandsfout"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Ongeldig bestand"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Bestand: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Naam: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Afzender: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pauze"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Doorgaan"
 
@@ -449,43 +449,63 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Vereist gir1.2-gupnpigd-1.0."
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "?functies:Beschikbaar"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Functie"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Fout bij verwerken bestand:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Extensie wordt niet ondersteund"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Afbeelding kan niet worden opgeslagen in %(type)s-formaat. Opslaan als "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 msgid "Save Image as…"
 msgstr "Afbeelding opslaan als…"
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "Opslaan _als"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Cliënt:Onbekend"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Onbekend"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Tijd:Onbekend"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "?Rol in groepsgesprek:<b>Rol:</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aansluiting:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
@@ -493,19 +513,19 @@ msgstr ""
 "Dit contact is geïnteresseerd in je aanwezigheidsinformatie, maar jij niet "
 "in zijn/haar aanwezigheid"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
 "Je bent geïnteresseerd in de aanwezigheidsinformatie van dit contact, maar "
-"dit is niet w"
+"dit is niet wederzijds"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 msgid "The contact and you want to exchange presence information"
 msgstr "Jij en het contact willen aanwezigheidsinformatie uitwisselen"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
@@ -513,27 +533,35 @@ msgstr ""
 "Jij en het contact zijn niet geïnteresseerd in elkaars "
 "aanwezigheidsinformatie"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Je wacht op een antwoord van je contact voor je abonneringsverzoek"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Er is geen lopend abonneringsverzoek."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " bron met prioriteit "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Alle bestanden"
 
+#: gajim/options_dialog.py:392
+msgid "Clear File"
+msgstr "Bestand wissen"
+
+#: gajim/options_dialog.py:474
+msgid "Manage Proxies"
+msgstr "Proxy’s beheren"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -574,13 +602,13 @@ msgid "_New Group Chat"
 msgstr "_Nieuw groepsgesprek"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Niet in het rooster"
 
@@ -592,7 +620,7 @@ msgstr "Ik zou je graag aan mijn rooster willen toevoegen"
 msgid "Send Single _Message…"
 msgstr "Enkel _bericht verzenden…"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Aangepas_te status sturen"
@@ -609,24 +637,24 @@ msgstr "Transport _beheren"
 msgid "_Modify Transport"
 msgstr "Transport b_ewerken"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 msgid "_Rename…"
 msgstr "_Hernoemen…"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Deblokkeren"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Blokkeren"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "_Verwijderen"
@@ -639,183 +667,201 @@ msgstr "_Informatie"
 msgid "Send File..."
 msgstr "Bestand verzenden…"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 msgid "Invite Contacts"
 msgstr "Contacten uitnodigen"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 msgid "Add to Roster"
 msgstr "Toevoegen aan rooster"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr "Audiosessie"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr "Videosessie"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 msgid "Information"
 msgstr "Informatie"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 msgid "History"
 msgstr "Geschiedenis"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 msgid "Manage Room"
 msgstr "Beheer ruimte"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 msgid "Change Subject"
 msgstr "Onderwerp veranderen"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 msgid "Configure Room"
 msgstr "Groepsgesprek configureren"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 msgid "Destroy Room"
 msgstr "Groepsgesprek vernietigen"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 msgid "Change Nick"
 msgstr "Bijnaam veranderen"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 msgid "Bookmark Room"
 msgstr "Groepsgesprek toevoegen aan bladwijzers"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 msgid "Request Voice"
 msgstr "Stem aanvragen"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 msgid "Notify on all messages"
 msgstr "Melding bij alle berichten"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr "Minimaliseren bij sluiten"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+msgid "Execute command"
+msgstr "Opdracht uitvoeren"
+
+#: gajim/gui_menu_builder.py:656
 msgid "Disconnect"
 msgstr "Verbinding verbreken"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Deelnemen aan groepsgesprek"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 msgid "Add Contact..."
 msgstr "Contact toevoegen…"
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 msgid "Profile"
 msgstr "Profiel"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 msgid "Discover Services"
 msgstr "Diensten ontdekken"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 msgid "Send Single Message..."
 msgstr "Enkel bericht verzenden…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: gajim/gui_menu_builder.py:737
 msgid "Archiving Preferences"
 msgstr "Archiefvoorkeuren"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 msgid "Synchronise History"
 msgstr "Geschiedenis synchroniseren"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Privacylijsten"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 msgid "Server Info"
 msgstr "Serverinfo"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML-console"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+msgid "Admin"
+msgstr "Admin"
+
+#: gajim/gui_menu_builder.py:744
 msgid "Send Server Message..."
 msgstr "Serverbericht verzenden…"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "MOTD instellen…"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "MOTD bijwerken…"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 msgid "Delete MOTD..."
 msgstr "MOTD verwijderen…"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 msgid "No Accounts available"
 msgstr "Geen accounts beschikbaar"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Accounts"
+
+#: gajim/history_manager.py:56
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 msgid "Options:"
 msgstr "Opties:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr "Dit hulpbericht weergeven en afsluiten"
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr "Kies map voor logboekbestand"
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Kan logboekdatabase niet vinden"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Bericht"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Wil je de database opschonen? (STERK AFGERADEN ALS GAJIM DRAAIT)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -829,92 +875,92 @@ msgstr ""
 "\n"
 "Als je op JA klikt, even geduld…"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr "Database opschonen"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 msgid "Exporting History Logs…"
 msgstr "Geschiedenislogboeken worden geëxporteerd…"
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s zei op %(time)s: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Wil je echt de volledige gespreksgeschiedenis met %(jid)s verwijderen?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr ""
 "Wil je echt de volledige gespreksgeschiedenis met de geselecteerde contacten "
 "verwijderen?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 msgid "This can not be undone."
 msgstr "Dit kan niet ongedaan gemaakt worden."
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr "Verwijderbevestiging"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Wil je het geselecteerde bericht echt verwijderen?"
 msgstr[1] "Wil je de geselecteerde berichten echt verwijderen?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Dit is een bewerking die niet ongedaan gemaakt kan worden."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 msgid "Retrieving profile…"
 msgstr "Profiel wordt opgehaald…"
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Kon afbeelding niet laden"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "Verkeerd datumformaat"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formaat: YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informatie ontvangen"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Het is niet mogelijk je contactinformatie te publiceren zonder verbinding."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 msgid "Sending profile…"
 msgstr "Profiel wordt verzonden…"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informatie NIET gepubliceerd"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard-publicatie is mislukt"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -932,10 +978,10 @@ msgstr "Contactnaam: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Algemeen"
@@ -1023,35 +1069,35 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vul de informatie van de contactpersoon in die je wil toevoegen"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Ongeldige gebruikers-ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "De gebruikers-ID kan geen bron bevatten."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Je kan jezelf niet aan je rooster toevoegen."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Dit contact staat al in je rooster."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Gebruikers-ID:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 msgid "Error while adding transport contact"
 msgstr "Fout bij toevoegen van transportcontact"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1065,57 +1111,57 @@ msgstr ""
 
 # TODO: Loop alles na, zet zinnen in de goede vorm, volg GNOME NL richtlijnen,
 #       ruim mnemonics op. Zie ook: http://nl.gnome.org/
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 msgid "A GTK+ XMPP client"
 msgstr "Een GTK+ XMPP-cliënt"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+-versie: %s"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGObject-versie: %s"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr "python-nbxmpp-versie: %s"
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 msgid "Current Developers"
 msgstr "Huidige ontwikkelaars"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 msgid "Past Developers"
 msgstr "Vroegere ontwikkelaars"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr "Artiesten"
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr "Tenslotte"
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 msgid "we would like to thank all the package maintainers."
 msgstr "willen we alle pakketonderhouders bedanken."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Nathan Follens <nthn@unseen.is>\n"
 "Stéphan Kochen <stephan@kochen.nl>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Woordenboek voor taal ‘%s’ niet beschikbaar"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1128,12 +1174,12 @@ msgstr ""
 "\n"
 "Functie voor markeren van verkeerd gespelde woorden zal niet gebruikt worden"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Onveilige verbinding"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1146,478 +1192,492 @@ msgstr ""
 "onversleuteld worden verstuurd. Dit soort verbinding wordt sterk afgeraden.\n"
 "Ben je zeker dat je wil doorgaan?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ik wil echt onveilig verbinden"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim zal NIET verbinden tenzij je dit aanvinkt"
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "Vraag mij _dit niet nogmaals"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "He_rvatten"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "Ver_vangen"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Ongeldige bijnaam"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 msgid "The nickname contains invalid characters."
 msgstr "De bijnaam bevat ongeldige tekens."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Abonneringsverzoek"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonneringsverzoek voor account %(account)s van %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonneringsverzoek van %s"
 
-#: gajim/dialogs.py:2364
-#, fuzzy
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 msgid "Join Groupchat"
 msgstr "Deelnemen aan groepsgesprek"
 
-#: gajim/dialogs.py:2506
-#, fuzzy
+#: gajim/dialogs.py:2500
 msgid "Invalid Room"
 msgstr "Ongeldig groepsgesprek"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
-msgstr ""
+msgstr "Kies een groepsgesprek"
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Ongeldige bijnaam"
 
-#: gajim/dialogs.py:2520
-#, fuzzy
+#: gajim/dialogs.py:2514
 msgid "Please choose a nickname"
-msgstr "Maak een mooi nieuw thema."
+msgstr "Kies een bijnaam"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Ongeldige JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 msgid "Wrong server"
 msgstr "Verkeerde server"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, python-format
 msgid "%s is not a groupchat server"
 msgstr "%s is geen groepsgespreksserver"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Zonder verbinding is het niet mogelijk je contacten te synchroniseren."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Naam"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Deze account is niet verbonden met de server"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Het is niet mogelijk met een account te synchroniseren zonder dat deze "
 "verbonden is."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synchroniseren"
 
-#: gajim/dialogs.py:2778
-#, fuzzy
+#: gajim/dialogs.py:2772
 msgid "Start new Conversation"
-msgstr "Verdergezet gesprek"
+msgstr "Nieuw gesprek starten"
 
-#: gajim/dialogs.py:3033
-#, fuzzy
+#: gajim/dialogs.py:3028
 msgid "New Groupchat"
 msgstr "Nieuw groepsgesprek"
 
-#: gajim/dialogs.py:3035
-#, fuzzy
+#: gajim/dialogs.py:3030
 msgid "New Contact"
-msgstr "Nieuw contact toevoegen"
+msgstr "Nieuw contact"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Contact is ingelogd"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Contact is uitgelogd"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nieuw bericht"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nieuw enkel bericht"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nieuw privébericht"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Nieuwe e-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Verzoek voor bestandsoverdracht"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Fout bij bestandsoverdracht"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht voltooid"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht gestopt"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Uitnodiging voor groepsgesprek"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Contact heeft zijn/haar status gewijzigd"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel bericht met account %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel bericht in account %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Enkel bericht"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "%s verzenden"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "%s ontvangen"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Formulier %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met ‘%s’."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 "Het is niet mogelijk een bericht te sturen naar %s, deze JID is ongeldig."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+msgid "Clear"
+msgstr "Wissen"
+
+#: gajim/dialogs.py:3563
+msgid "Filter"
+msgstr "Filteren"
+
+#: gajim/dialogs.py:3568
+msgid "XML Input"
+msgstr "XML-invoer"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Verzenden"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "toevoegen"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "bewerken"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "verwijderen"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%(jid)s</b> wil dat je enkele contacten zou <b>%(action)s</b>."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Toevoegen"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Bewerken"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Groepen"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s heeft me aangeraden je aan mijn rooster toe te voegen."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "%d contact toegevoegd"
 msgstr[1] "%d contacten toegevoegd"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "%d contact verwijderd"
 msgstr[1] "%d contacten verwijderd"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Archiefvoorkeuren voor %s"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr "Succes!"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Your Archiving Preferences have been saved!"
 msgstr "Je archiefvoorkeuren zijn opgeslagen!"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr "We ontvingen geen antwoord van de server"
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr "We hebben een fout ontvangen: {}"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 msgid "Error!"
 msgstr "Fout!"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 msgid "Add JID"
 msgstr "JID toevoegen"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacylijst <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacylijst voor %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Privacylijst"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Volgorde: %(order)s, actie: %(action)s, type: %(type)s, waarde: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Volgorde: %(order)s, actie: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Regel wijzigen</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Regel toevoegen</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacylijsten voor %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Ongeldige lijstnaam"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Je moet een naam invullen om een privacylijst aan te maken."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Je bent uitgenodigd in een groepsgesprek"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact heeft je uitgenodigd voor een gesprek"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact heeft je uitgenodigd in groepsgesprek %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Wil je de uitnodiging aanvaarden?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr "Reden (als je weigert):"
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "Kies cliëntcertificaat #PCKS12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "PKCS12-bestanden"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Kies geluid"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "WAV-geluiden"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Kies afbeelding"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "Kies archief"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "Zip-bestanden"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wanneer %s wordt:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Speciale melding voor %s wordt toegevoegd"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "een audio- en video-"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "een audio-"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "een video-"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -1626,12 +1686,12 @@ msgstr ""
 "%(contact)s wil een %(type)s sessie met je beginnen. Wil je de oproep "
 "beantwoorden?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr "Certificaat voor account %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1674,67 +1734,92 @@ msgstr ""
 "\n"
 "SHA-256-vingerafdruk: %(sha256)s\n"
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL-certificaatverificatie voor %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr "Certificaat bekijken…"
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+msgid "File Transfer"
+msgstr "Bestandsoverdracht"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr "HTTP-uploadslot opvragen…"
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr "Bestand uploaden met HTTP-bestandsupload…"
+
+#: gajim/dialogs.py:5446
+msgid "Encrypting file..."
+msgstr "Bestand versleutelen…"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s is nu bekend als %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Sturen van privébericht mislukt"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Je bent niet meer in groepsgesprek ‘%(room)s’ of ‘%(nick)s’ heeft het "
 "groepsgesprek verlaten."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr "HTTP-bestandsupload"
+
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr "HTTP-bestandsupload wordt niet ondersteund door je server"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Onderwerp veranderen"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Bijnaam veranderen"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 msgid "Invalid group chat JID"
 msgstr "Ongeldige JID voor groepsgesprek"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 msgid "The group chat JID has not allowed characters."
 msgstr "De JID van het groepsgesprek heeft niet toegelaten tekens."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "%s vernietigen"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
@@ -1742,246 +1827,254 @@ msgstr ""
 "Je staat op het punt dit groepsgesprek definitief te verwijderen.\n"
 "Je kan hieronder een reden opgeven:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Je kan ook een andere locatie opgeven:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Bijnaam invoeren"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "en geauthenticeerd"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "en NIET geauthenticeerd"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr "%(type)s-versleuteling is actief %(authenticated)s."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Gesprek met "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Verdergezet gesprek"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s heeft het onderwerp ingesteld als %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Elke deelnemer kan je volledige JID te zien"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr "Groepsgesprek toont nu niet beschikbare leden"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr "Groepsgesprek verbergt nu niet-beschikbare leden"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr "Een instelling is gewijzigd, niet gerelateerd aan privacy"
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Opslaan van berichten in groepsgesprek is nu ingeschakeld"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Opslaan van berichten in groepsgesprek is nu uitgeschakeld"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Groepsgesprek is nu niet-anoniem"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Groepsgesprek is nu semi-anoniem"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr "Groepsgesprek is nu volledig anoniem"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(jid)s is in dit groepsgesprek uitgenodigd"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Opslaan van berichten in groepsgesprek is ingeschakeld"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Een nieuw groepsgesprek is aangemaakt"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "De server heeft je bijnaam toegewezen of aangepast"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit het groepsgesprek geschopt: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit het groepsgesprek geschopt door %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit het groepsgesprek verbannen: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit het groepsgesprek verbannen door %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s is uit het groepsgesprek verwijderd (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "aansluiting veranderd"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "gespreksconfiguratie veranderd naar alleen-leden"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "uitschakelen van systeem"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Aansluiting van %(nick)s is ingesteld als %(affiliation)s door %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Aansluiting van %(nick)s is ingesteld als %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rol van %(nick)s is ingesteld als %(role)s door %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rol van %(nick)s is ingesteld als %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft het groepsgesprek verlaten"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s neemt nu deel aan het groepsgesprek"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Weet je zeker dat je het groepsgesprek ‘%s’ wil verlaten?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Als je dit venster sluit zal de verbinding met dit groepsgesprek verbroken "
 "worden."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Je kan hieronder een reden opgeven:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+msgid "Jingle File Transfer"
+msgstr "Jingle-bestandsoverdracht"
+
+#: gajim/chat_control.py:331
+msgid "No File Transfer available"
+msgstr "Geen bestandsoverdracht beschikbaar"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Toon een lijst van opmaakstijlen"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr "Opmaak is niet beschikbaar wanneer GPG in gebruik is"
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
 msgstr "Dit contact ondersteunt geen HTML"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s toestand : %(state)s, reden: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s van groepsgesprek %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Sessie-onderhandeling geannuleerd"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "Deze sessie ZAL gearchiveerd worden op de server"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "Deze sessie ZAL NIET gearchiveerd worden op de server"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Deze sessie is versleuteld"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " en WORDT bijgehouden"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " en WORDT niet bijgehouden"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -1989,16 +2082,16 @@ msgstr ""
 "Identiteit van contact niet geverifieerd. Klik op de schild-knop voor "
 "details."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E-versleuteling uitgeschakeld"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
-msgstr "Je hebt zojuist een nieuw bericht ontvangen van \"%s\""
+msgstr "Je hebt zojuist een nieuw bericht ontvangen van ‘%s’"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2007,7 +2100,7 @@ msgstr ""
 "verlorgen gaan."
 
 # .
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2016,7 +2109,7 @@ msgstr ""
 "Onderwerp: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2025,91 +2118,91 @@ msgstr ""
 "Kon bericht van %s niet ontsleutelen\n"
 "Er is mogelijk mee geknoeid."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is nu %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 msgid "File transfer"
 msgstr "Bestandsoverdracht"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr "Grootte"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr "_Aanvaarden"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Binnengaan"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Contact heeft de overdracht gestopt"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Fout bij openen van bestand"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Groepsgesprekken"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transporten"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 msgid "Authorization sent"
 msgstr "Machtiging verzonden"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, python-format
 msgid "\"%s\" will now see your status."
 msgstr "‘%s’ zal nu je status zien."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Als ‘%s’ dit verzoek aanvaardt zal je zijn/haar status kunnen ontvangen."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 msgid "Authorization removed"
 msgstr "Machtiging verwijderd"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "‘%s’ zal je nu altijd als offline zien."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr "OpenPGP is niet bruikbaar"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2120,11 +2213,11 @@ msgstr ""
 "Let op: er is een incompatibel python-pakket genaamd ‘gnupg’.\n"
 "Je zal zonder OpenPGP met %s verbonden worden."
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2133,27 +2226,27 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "niet gesynchroniseerd"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Gajim echt afsluiten?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Weet je zeker dat je Gajim wil afsluiten?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Gajim altijd sluiten"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "Je hebt lopende bestandsoverdrachten"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
@@ -2161,11 +2254,11 @@ msgstr ""
 "Als je nu afsluit zullen de momenteel bezige bestandsoverdrachten worden "
 "stopgezet. Wil je nog steeds afsluiten?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2173,16 +2266,16 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als je geschiedenis "
 "ingeschakeld hebt en het contact in je rooster staat."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "You moet ze lezen voor je dit transport verwijdert."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport ‘%s’ zal worden verwijderd"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2190,11 +2283,11 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via dit transport."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transporten zullen worden verwijderd"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2203,70 +2296,70 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transporten: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Je staat op het punt een contact te blokkeren. Ben je zeker dat je wil "
 "doorgaan?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 "Dit contact zal je offline zien en je zal er geen berichten van ontvangen."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Contact hernoemen"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Voer een nieuwe bijnaam in voor contact %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Groep hernoemen"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Voer een nieuwe naam in voor groep %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Groep verwijderen"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Wil je groep %s zeker uit het rooster verwijderen?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Verwijder ook alle contacten in deze groep van je rooster"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-sleutel toewijzen"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact ‘%s’ zal van je rooster verwijderd worden"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Je staat op het punt ‘%(name)s’ (%(jid)s) uit je rooster te verwijderen.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
 "always seeing you as offline."
@@ -2274,11 +2367,11 @@ msgstr ""
 "Door dit contact te verwijderen zal je ook zijn/haar toestemming opzeggen om "
 "je status te zien, en zal hij/zij je altijd als offline zien."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Wil je doorgaan?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in them always seeing you as offline."
@@ -2286,15 +2379,15 @@ msgstr ""
 "Door dit contact te verwijderen zal je ook zijn/haar toestemming opzeggen om "
 "je status te zien. Hij/zij zal je altijd als offline zien."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Ik wil dat dit contact na verwijdering mijn status kan blijven zien"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Contacten zullen uit je rooster verwijderd worden"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2304,13 +2397,13 @@ msgstr ""
 "zal je ook hun toestemming opzeggen om je status te zien en zullen ze je "
 "altijd als offline zien."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Je staat op het punt een aangepaste status te verzenden. Weet je het zeker?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2319,27 +2412,27 @@ msgstr ""
 "Dit contact zal je tijdelijk zien als %(status)s tot je je status verandert, "
 "dan zal hij of zij je globale status zien."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 "Je kan niet deelnemen aan een groepsgesprek terwijl je onzichtbaar bent"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontactenopslag wordt niet ondersteund door je server"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -2348,12 +2441,12 @@ msgstr ""
 "metacontacteninformatie, deze informatie zal dus niet opgeslagen worden bij "
 "de volgende verbinding."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Je staat op het punt een metacontact aan te maken. Weet je het zeker?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
@@ -2362,184 +2455,185 @@ msgstr ""
 "hergroeperen. Het wordt meestal gebruikt wanneer dezelfde persoon meerdere "
 "XMPP- of transportaccounts heeft."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Ongeldige bestands-URI:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Wil je dit bestand sturen naar %s:"
 msgstr[1] "Wil je deze bestanden sturen naar %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Stuur %(from)s naar %(to)s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "%s instellen als hoofdcontact"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "%(contact1)s en %(contact2)s instellen als metacontacten"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Wijzig statusbericht"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Deuntje publiceren"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "Locatie publiceren"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 msgid "Configure Services…"
 msgstr "Diensten configureren…"
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "Alles _maximaliseren"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Groepsb_ericht versturen"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Aan alle gebruikers"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Aan alle beschikbare gebruikers"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Uitnodigen voor"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "Contacten _beheren"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 msgid "Edit _Groups…"
 msgstr "_Groepen bewerken…"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maximaliseren"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "Opnieuw ve_rbinden"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "Verbin_ding verbreken"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Geschiedenisbeheer"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "Deelnemen aan n_ieuw groepsgesprek"
 
-#: gajim/roster_window.py:5774
-msgid "Change Status Message…"
-msgstr "Statusbericht wijzigen…"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 msgid "Show the application's version"
 msgstr "Toepassingsversie weergeven"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 msgid "Show only critical errors"
 msgstr "Alleen kritieke fouten weergeven"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 "Profielbestanden volledig scheiden (zelfs geschiedenisdatabase en plug-ins)"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr "XML-stanza’s en andere debuginformatie afdrukken"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 msgid "Use defined profile in configuration directory"
 msgstr "Gebruik opgegeven profiel in configuratiemap"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 msgid "Set configuration directory"
 msgstr "Configuratiemap instellen"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr "Logboeksysteem configureren"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 msgid "Show all warnings"
 msgstr "Alle waarschuwingen weergeven"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr "ipython-shell openen"
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Databasefout"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 msgid "How far back do you want to go?"
 msgstr "Hoe ver terug wil je gaan?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr "Een maand"
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr "Drie maanden"
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr "Een jaar"
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr "Alles"
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 msgid "Connecting..."
 msgstr "Verbinden…"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr "%(received)s van %(max)s"
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, python-format
 msgid "Downloaded %s Messages"
 msgstr "%s berichten gedownload"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2552,7 +2646,7 @@ msgstr ""
 "        {received} berichten gedownload.\n"
 "        "
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2564,7 +2658,7 @@ msgstr ""
 "        met het archief.\n"
 "        "
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2711,16 +2805,16 @@ msgstr ""
 "Om de registratie van een account bij een server ongedaan te maken, moet "
 "deze eerst ingeschakeld zijn."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Wachtwoord vereist"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Voer je wachtwoord voor account %s in"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Wachtwoord opslaan"
 
@@ -2750,10 +2844,18 @@ msgstr "Alleen verwijderen van Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr "Niets verwijderen. Ik probeer het later opnieuw"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Alles"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Alleen binnenkomen en verlaten"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Geen"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Nieuw groepsgesprek"
@@ -2819,11 +2921,11 @@ msgstr "Ongeldige invoer"
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certificaat al in bestand"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2931,90 +3033,110 @@ msgstr "Vermeld in groepsgesprek"
 msgid "Group Chat Message Received"
 msgstr "Bericht ontvangen in groepsgesprek"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s van dit groepsgesprek"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Aansluiting van contact in groepsgesprek:Geen"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Lid"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [geblokkeerd]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [geminimaliseerd]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Verbonden"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+msgid "?Noun:Download"
+msgstr "?Znw:Download"
+
+#: gajim/tooltips.py:653
+msgid "?Noun:Upload"
+msgstr "?Znw:Upload"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Type: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Afgerond"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?overdrachtstatus:Gepauzeerd"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "?gebruikersstatus:Aanwezig"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Open voor gesprek"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Afwezig"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Bezig"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Niet beschikbaar"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Offline"
 
@@ -3063,118 +3185,122 @@ msgstr "(Niets)"
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr "Machine gaat slapen"
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr "Netwerkverbinding verbreken"
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Gespreksgeschiedenis van %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Gespreksgeschiedenis"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Schijffout"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is nu %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Fout: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Fout"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is nu: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 msgid "_Change Status Message…"
 msgstr "_Statusbericht wijzigen…"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 msgid "_Manage Bookmarks…"
 msgstr "_Bladwijzers beheren…"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "_Rooster verbergen"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "_Rooster weergeven"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "Kan afbeelding niet laden"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Mediatype wordt niet ondersteund: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "Dit veld is vereist"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "nieuw@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nieuw%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
-msgstr "%s dagen, %s uur"
+msgid "%(days)s days, %(hours)s hours"
+msgstr "%(days)s dagen, %(hours)s uur"
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 msgid "Hostname"
 msgstr "Hostnaam"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr "Serversoftware"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 msgid "Server Uptime"
 msgstr "Serveruptime"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3332,7 +3458,7 @@ msgstr "_Abonneer"
 msgid "_Unsubscribe"
 msgstr "Abonnement _opzeggen"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3340,50 +3466,58 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat\n"
 "je laatst op dit groepsgesprek gelet hebt"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Citeren"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Acties voor ‘%s’"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-artikel lezen"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Opzoeken in woor_denboek"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "‘%s’ ontbreekt in de URL van het woordenboek en het is geen WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "‘%s’ ontbreekt in de URL van de zoekmachine"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Zoeken op het internet"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Openen a_ls verwijzing"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr "URL:"
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 msgid "Invalid URL"
 msgstr "Ongeldige URL"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+"<b>Bericht is gewijzigd. Oorspronkelijk bericht was:</b>\n"
+"{}"
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3394,30 +3528,34 @@ msgstr[1] "%(nb_days)i dagen geleden"
 msgid "Write a message.."
 msgstr "Schrijf een bericht…"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Je staat op het punt meerdere tabbladen te sluiten"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Wil je ze echt allemaal sluiten?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+msgid "?Noun:Chats"
+msgstr "?Znw:Gesprekken"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Privégesprekken"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Berichten"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Kan niet deelnemen aan het groepsgesprek"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3430,107 +3568,107 @@ msgstr ""
 "is al in gebruik of geregistreerd door een andere gebruiker.\n"
 "Geef een andere bijnaam op:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Gebruik altijd deze bijnaam bij een conflict"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Aanvaard je dit verzoek?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Aanvaard je dit verzoek op account %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s)-machtiging voor %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Verbinding mislukt"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Een wachtwoord is vereist om groepsgesprek %s binnen te komen, voer het in."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>%s</b> is vol"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Je bent verbannen uit groepsgesprek <b>%s</b>."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Externe server <b>%s</b> bestaat niet."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Groepsgesprek <b>%s</b> bestaat niet."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 msgid "Group chat creation is not permitted."
 msgstr "Aanmaken van groepsgesprekken is niet toegestaan."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 msgid "Unable to join groupchat"
 msgstr "Kan niet deelnemen aan het groepsgesprek"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Je geregistreerde bijnaam moet gebruikt worden in <b>%s</b>."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Je staat niet in de ledenlijst van groepsgesprek %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fout %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fout bij versturen van %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Waarnemers"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Machtiging aanvaard"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Contact ‘%s’ heeft je toestemming gegeven zijn/haar status te zien."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact ‘%s’ heeft het abonnement op jou opgezegd"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
@@ -3538,31 +3676,31 @@ msgstr ""
 "Je zal hem of haar altijd als offline zien.\n"
 "Wil je hem of haar uit je contacten verwijderen?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Abonnement opgezegd"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met ‘%s’"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s heeft de uitnodiging geweigerd: %(reason)s"
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s heeft de uitnodiging geweigerd"
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
@@ -3570,32 +3708,32 @@ msgstr ""
 "Je hebt Gajim ingesteld om OpenPGP-agent te gebruiken, maar OpenPGP-agent "
 "wordt niet uitgevoerd of gaf een verkeerd wachtwoord weer.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP-sleutel."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 msgid "Wrong passphrase"
 msgstr "Verkeerd wachtwoord"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 msgid "Wrong OpenPGP passphrase"
 msgstr "Verkeerd OpenPGP-wachtwoord"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 msgid "Certificate Passphrase Required"
 msgstr "Certificaatwachtwoord vereist"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Voer het wachtwoord in van het certificaat voor account %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid "Untrusted OpenPGP key"
 msgstr "Niet-vertrouwde OpenPGP-sleutel"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
@@ -3603,96 +3741,100 @@ msgstr ""
 "De OpenPGP-sleutel die gebruikt wordt voor het versleutelen van dit gesprek "
 "is niet vertrouwd. Wil je dit bericht toch versleutelen?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr "Kopieer / plak het verversingstoken van de zonet geopende website."
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr "OAuth2-gebruikersreferentie"
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL-certificaatfout"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 msgid "File Transfer Failed"
 msgstr "Bestandsoverdracht mislukt"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "%(filename)s ontvangen van %(name)s."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s mislukt."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Je hebt %(filename)s naar %(name)s gestuurd."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s mislukt."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+msgid "Choose file to send"
+msgstr "Kies bestand om te verzenden"
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Kan bericht niet ontsleutelen"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Gebruikersnaamconflict"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Voer een nieuwe gebruikersnaam in voor je lokale account"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Bronconflict"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 "Je bent al verbonden met deze account van dezelfde bron. Voer een andere in"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wil een audiogesprek starten."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Audiogespreksverzoek"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Fout bij verifiëren van SSL-certificaat"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3703,7 +3845,7 @@ msgstr ""
 "server: %(error)s\n"
 "Wil je nog steeds met deze server verbinden?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3718,15 +3860,15 @@ msgstr ""
 "SHA-256-vingerafdruk van het certificaat:\n"
 "%(sha256)s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Negeer deze fout voor dit certificaat."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr "Niet-anonieme server"
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3751,7 +3893,7 @@ msgstr ""
 "\n"
 "Wil je nog steeds verbinden en de vingerafdruk van het certificaat bijwerken?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3760,7 +3902,7 @@ msgstr ""
 "verbinding. Je zou PyOpenSSL moeten installeren om dat te voorkomen. Ben je "
 "zeker dat je dat wil doen?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3768,16 +3910,15 @@ msgstr ""
 "Je staat op het punt je wachtwoord onversleuteld via een onveilige "
 "verbinding te verzenden. Weet je het zeker?"
 
-#: gajim/gui_interface.py:1807
-#, fuzzy
+#: gajim/gui_interface.py:1848
 msgid "JID is not a Groupchat"
-msgstr "Dit is geen groepsgesprek"
+msgstr "Deze JID is geen groepsgesprek"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Emoticons uitgeschakeld"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3785,7 +3926,7 @@ msgstr ""
 "Je ingestelde emoticon-thema is niet gevonden dus zijn emoticons "
 "uitgeschakeld."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
@@ -3793,11 +3934,11 @@ msgstr ""
 "Je ingestelde emoticon-thema is niet gevonden dus zijn emoticons uitgezet. "
 "Bekijk het logboek voor details."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Dit is geen groepsgesprek"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3808,32 +3949,32 @@ msgstr ""
 "groepsgespreksnaam is. Zo ja, verwijder het van je rooster en probeer "
 "opnieuw deel te nemen aan het groepsgesprek."
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "standaard"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Wachtwoord vereist"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Voer het wachtwoord in voor de OpenPGP-sleutel %(keyid)s (account "
 "%(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 msgid "OpenPGP key expired"
 msgstr "OpenPGP-sleutel verlopen"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
@@ -3841,11 +3982,11 @@ msgstr ""
 "Je OpenPGP-sleutel is verlopen, je zal verbonden worden met %s zonder "
 "OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Verkeerd wachtwoord"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Voer je OpenPGP-wachtwoord opnieuw in of druk op Annuleren."
 
@@ -3914,12 +4055,14 @@ msgstr "- berichten zullen worden opgeslagen"
 msgid "- messages will not be logged"
 msgstr "- berichten zullen niet worden opgeslagen"
 
+#: gajim/notify.py:103
+msgid "Open"
+msgstr "Openen"
+
 #: gajim/dialog_messages.py:33
-#, fuzzy
 msgid "You can not start a new conversation unless you are connected."
 msgstr ""
-"Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
-"zijn."
+"Het is niet mogelijk een nieuw gesprek te starten zonder verbonden te zijn."
 
 #: gajim/dialog_messages.py:48
 msgid "Unread events"
@@ -3945,7 +4088,7 @@ msgstr "Ongeldige invoer"
 msgid "The form is not filled correctly."
 msgstr "Het formulier is niet correct ingevuld."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
@@ -3980,9 +4123,9 @@ msgid "Wrong Custom Hostname"
 msgstr "Verkeerde aangepaste hostnaam"
 
 #: gajim/dialog_messages.py:85
-#, fuzzy, python-format
+#, python-format
 msgid "Wrong custom hostname \"%s\". Ignoring it."
-msgstr "Verkeerde aangepaste hostnaam"
+msgstr "Verkeerde aangepaste hostnaam ‘%s’ wordt genegeerd."
 
 #: gajim/dialog_messages.py:89
 msgid "Error while removing privacy list"
@@ -4072,6 +4215,52 @@ msgstr ""
 "%s\n"
 "Link-lokaal-berichten werken mogelijk niet goed."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+msgid "Could not request upload slot"
+msgstr "Kon uploadslot niet opvragen"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr "Onverwacht antwoord ontvangen van server (zie log)"
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+msgid "Could not open file"
+msgstr "Kon bestand niet openen"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr "Uitzondering bij openen van bestand (zie log)"
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr "Onveilig"
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr "Server gaf een onveilig transport weer (http)"
+
+#: gajim/dialog_messages.py:162
+msgid "Could not upload file"
+msgstr "Kon bestand niet uploaden"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr "HTTP-antwoordcode van server: %s"
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr "Uploadfout"
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr "Versleutelingsfout"
+
+#: gajim/dialog_messages.py:173
+msgid "For the choosen encryption is no encryption method available"
+msgstr ""
+"Er is geen versleutelingsmethode beschikbaar voor de gekozen versleuteling"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Thema"
@@ -4096,7 +4285,15 @@ msgstr "Je kunt je huidige thema niet verwijderen"
 msgid "Pick another theme to use first."
 msgstr "Kies eerst een ander thema."
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+msgid "Merge Accounts"
+msgstr "Accounts samenvoegen"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr "PGP-agent gebruiken"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Zo terug."
 
@@ -4120,6 +4317,10 @@ msgstr ""
 "Alle gespreks- en groepsgespreksvensters zullen gesloten worden. Wil je "
 "doorgaan?"
 
+#: gajim/accounts_window.py:344
+msgid "Remove"
+msgstr "Verwijderen"
+
 #: gajim/accounts_window.py:387
 msgid "Rename account label"
 msgstr "Accountlabel hernoemen"
@@ -4292,48 +4493,60 @@ msgstr "Verander wachtwoord"
 msgid "Login Options"
 msgstr "Inlogopties"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus bevindt zich niet op deze machine of de python module ontbreekt"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Toont hulp voor een specifieke opdracht"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "opdracht"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "toont hulp bij opdracht"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Toont of verbergt roostervenster"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Toont een venster met de volgende lopende gebeurtenis"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Lijst alle contacten in het rooster op, elk contact komt op een aparte regel"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+msgid "?CLI:account"
+msgstr "?CLI:account"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "geef alleen contacten weer van de gegeven account"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Drukt een lijst van geregistreerde accounts af"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 msgid "Changes the status of account(s)"
 msgstr "Verandert de status van de account(s)"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+msgid "?CLI:status"
+msgstr "?CLI:status"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4342,11 +4555,16 @@ msgstr ""
 "invisible (onzichtbaar). Gebruik vorige status van account indien niet "
 "ingesteld"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+msgid "?CLI:message"
+msgstr "?CLI:bericht"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "statusbericht"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4355,15 +4573,19 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 msgid "Changes the priority of account(s)"
 msgstr "Verandert de prioriteit van de account(s)"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+msgid "?CLI:priority"
+msgstr "?CLI:prioriteit"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "prioriteit die je aan de account wil geven"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4372,7 +4594,7 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4382,30 +4604,30 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen ‘account’ wil opgeven "
 "zonder ‘OpenPGP-sleutel’, zet ‘OpenPGP-sleutel’ dan op ‘’."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "berichtinhoud"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr "PGP-sleutel"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "indien opgegeven zal het bericht versleuteld worden met deze publieke sleutel"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "indien opgegeven zal het bericht verzonden worden met deze account"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
 "and account. If you want to only set the latter, set OpenPGP key to \"\"."
@@ -4414,128 +4636,128 @@ msgstr ""
 "account zijn optioneel. Als je alleen ‘account’ wil opgeven zonder ‘OpenPGP-"
 "sleutel’, stel deze laatste dan in op ‘’."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "onderwerp"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "berichtonderwerp"
 
 # Kan beter vertaald worden
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
-msgstr "Stuurt een nieuw bericht naar een groepsgesprek waaraan je deelneemt."
+msgstr "Stuurt een nieuw bericht in een groepsgesprek waaraan je deelneemt."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID van het groepsgesprek dat het bericht zal ontvangen"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Haalt gedetailleerde informatie op over een contact"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Haalt gedetailleerde informatie op over een contact"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Naam van de account"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand naar een contact"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "bestand"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Bestandspad"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "indien opgegeven zal het bestand verzonden worden met deze account"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Toont alle voorkeuren en hun waarden"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van ‘sleutel’ op ‘waarde’."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
-"'sleutel' is de naam van de voorkeur, 'waarde' is de waarde die zal worden "
+"‘sleutel’ is de naam van de voorkeur, ‘waarde’ is de waarde die zal worden "
 "ingesteld"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeursitem"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "sleutel"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Schrijft de huidige toestand van de Gajim-voorkeuren weg naar het .config-"
 "bestand"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Verwijdert contact van rooster"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "indien opgegeven zal contact van de contactlijst van deze account gehaald "
 "worden"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Geeft de huidige status weer (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Geeft het huidig statusbericht weer (de globale status, tenzij een account "
 "is opgegeven)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Geeft het aantal ongelezen berichten weer"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Verstuurt aangepaste XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "Te versturen XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4543,15 +4765,15 @@ msgstr ""
 "Account waarnaar de XML verzonden zal worden; indien niet opgegeven, zal ze "
 "naar alle account verzonden worden"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Avatar veranderen"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Te gebruiken afbeelding"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4559,19 +4781,19 @@ msgstr ""
 "Account waarvoor de avatar ingesteld zal worden; indien niet opgegeven, zal "
 "ze voor alle accounts ingesteld worden"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Controleer of Gajim wordt uitgevoerd"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Toont of verbergt het ipython-venster"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Parameter ‘contact_jid’ ontbreekt"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4580,17 +4802,17 @@ msgstr ""
 "‘%s’ staat niet in je rooster.\n"
 "Geef een account op om het bericht mee te sturen."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Het lijkt erop dat Gajim niet wordt uitgevoerd, dus kan je gajim-remote niet "
 "gebruiken."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4599,16 +4821,16 @@ msgstr ""
 "Gebruik: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Parameters:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4621,7 +4843,7 @@ msgstr ""
 "\n"
 "Opdracht is een van:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4630,14 +4852,14 @@ msgstr ""
 "Te veel parameters. \n"
 "Voer ‘%(basename)s help %(command)s’ in voor meer informatie"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Parameter ‘%(arg)s’ is niet gespecificeerd. \n"
-"Voer \"%(basename)s help %(command)s’ in voor meer informatie"
+"Voer ‘%(basename)s help %(command)s’ in voor meer informatie"
 
 #: gajim/common/app.py:263
 msgid "Unable to load idle module"
@@ -4805,11 +5027,6 @@ msgstr "Eind van de week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/passwords.py:84
-#, python-format
-msgid "XMPP account %s"
-msgstr "XMPP-account %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4834,52 +5051,52 @@ msgstr "Groepsgesprek is verwijderd"
 msgid "You can join this room instead: %s"
 msgstr "Je kan in plaats daarvan deelnemen aan dit groepsgesprek: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Onbekende SSL-fout: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nieuw enkel bericht van %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nieuw privébericht van groepsgesprek %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Bericht ontvangen van %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nieuw bericht van %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s wijzigde zijn/haar status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s is ingelogd"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s is uitgelogd"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Niet in rooster"
 
@@ -4930,8 +5147,8 @@ msgstr ""
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
-"Wanneer systeemvakpictogram weer te geven. Kan 'never' (nooit), "
-"'on_event' (bij gebeurtenis) of 'always' (altijd) zijn."
+"Wanneer systeemvakpictogram weer te geven. Kan ‘never’ (nooit), "
+"‘on_event’ (bij gebeurtenis) of ‘always’ (altijd) zijn."
 
 #: gajim/common/config.py:90
 msgid "Allow to hide the roster window even if the tray icon is not shown."
@@ -5198,7 +5415,7 @@ msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Verstuurde gesprekstoestandsmeldingen. Kan all (alle), composing_only "
-"(alleen 'aan het typen') of disabled (uitgezet) zijn."
+"(alleen ‘aan het typen’) of disabled (uitgeschakeld) zijn."
 
 #: gajim/common/config.py:198
 msgid ""
@@ -5206,7 +5423,7 @@ msgid ""
 "composing_only, disabled."
 msgstr ""
 "Gesprekstoestandsmeldingen weergegeven in gespreksvensters. Kan all (alle), "
-"composing_only (alleen 'aan het typen') of disabled (uitgezet) zijn."
+"composing_only (alleen ‘aan het typen’) of disabled (uitgeschakeld) zijn."
 
 #: gajim/common/config.py:200
 msgid ""
@@ -5227,7 +5444,7 @@ msgid ""
 "on this space separated list."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster met een van "
-"de JID's op deze door spaties gescheiden lijst."
+"de JID’s op deze door spaties gescheiden lijst."
 
 #: gajim/common/config.py:203
 msgid ""
@@ -5235,7 +5452,7 @@ msgid ""
 "this space separated list."
 msgstr ""
 "Vraag nooit om bevestiging voor het sluiten van een groepsgesprek met een "
-"van de JID's op deze door spaties gescheiden lijst."
+"van de JID’s op deze door spaties gescheiden lijst."
 
 #: gajim/common/config.py:204
 msgid ""
@@ -5441,9 +5658,9 @@ msgid ""
 "'last_state' - Restore the last state roster."
 msgstr ""
 "Rooster weergeven bij opstarten.\n"
-"'always' - Rooster altijd weergeven.\n"
-"'never' - Rooster nooit weergeven.\n"
-"'last_state' - Laaste toestand van rooster herstellen."
+"‘always’ - Rooster altijd weergeven.\n"
+"‘never’ - Rooster nooit weergeven.\n"
+"‘last_state’ - Laaste toestand van rooster herstellen."
 
 #: gajim/common/config.py:265
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -5485,8 +5702,8 @@ msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
-"Lijst van kleuren, onderbroken door \":\", die gebruikt worden om bijnamen "
-"in groepsgesprekken in te kleuren."
+"Lijst van kleuren, onderbroken door ‘:’, die gebruikt worden om bijnamen in "
+"groepsgesprekken in te kleuren."
 
 #: gajim/common/config.py:273
 msgid "Ctrl-Tab go to next composing tab when none is unread."
@@ -5542,7 +5759,7 @@ msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
-"Kan leeg, 'chat' (gesprek) of 'normal' (normaal) zijn. Indien niet leeg "
+"Kan leeg, ‘chat’ (gesprek) of ‘normal’ (normaal) zijn. Indien niet leeg "
 "worden alle inkomende berichten behandeld als waren ze van dit type"
 
 #: gajim/common/config.py:280
@@ -5736,15 +5953,11 @@ msgstr ""
 "Moet Gajim automatisch een versleutelde sessie proberen starten wanneer "
 "mogelijk?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
-msgstr ""
-"Geordende lijst (door spaties geschieden) van te proberen verbindingstypes. "
-"Kan ‘tls’, ‘ssl’ of ‘plain’ zijn"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
+msgstr "Onversleutelde verbindingen toestaan"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
@@ -5754,7 +5967,7 @@ msgstr ""
 "bevatten: ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-"
 "MD5, PLAIN, X-MESSENGER-OAUTH2 of XEP-0078"
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -5763,33 +5976,33 @@ msgstr ""
 "over een niet-beveiligde verbinding. Kan ‘warn’ (waarschuwen), "
 "‘connect’ (verbinden) of ‘disconnect’ (verbinding verbreken) zijn"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Geeft een waarschuwingsdialoog weer voor het gebruiken van een standaard SSL-"
 "bibliotheek."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Geeft een waarschuwingsdialoog weer voor het versturen van een PLAIN (platte "
 "tekst) wachtwoord over een plain (niet beveiligde) verbinding."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Door spaties gescheiden lijst van te negeren SSL-fouten."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
-"Door spaties gescheiden lijst van JID's waarmee je je gesprekken niet wilt "
+"Door spaties gescheiden lijst van JID’s waarmee je je gesprekken niet wilt "
 "opslaan. Je kan ook je eigen accountnaam toevoegen om niets van die account "
 "op te slaan."
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
@@ -5797,23 +6010,23 @@ msgstr ""
 "Bij opstarten zal Gajim de logboeken opgeslagen op de server downloaden, "
 "indien de server ondersteuning biedt voor XEP-0313"
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
-"Door spaties gescheiden lijst van JID's waarvoor je aanvaardt je gesprekken "
+"Door spaties gescheiden lijst van JID’s waarvoor je aanvaardt je gesprekken "
 "niet op te slaan als zij dat niet willen."
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Witruimte verzonden na inactiviteit"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP-ping verzonden na inactiviteit"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
@@ -5821,47 +6034,47 @@ msgstr ""
 "Aantal seconden te wachten op antwoord van ping-alive-pakket vooraleer "
 "poging tot opnieuw verbinden?"
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Tijdelijke oplossing voor jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
-"Indien aangevinkt zal Gajim je IP en proxy's gedefinieerd in de optie "
+"Indien aangevinkt zal Gajim je IP-adres en proxy’s gedefinieerd in de optie "
 "file_transfer_proxies gebruiken voor bestandsoverdracht."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
-"Indien ingeschakeld zal Gajim bestandsoverdrachtproxy's testen bij "
-"opstarten. De proxy's van Openfire slagen vaak niet in deze test, zelfs als "
+"Indien ingeschakeld zal Gajim bestandsoverdrachtproxy’s testen bij "
+"opstarten. De proxy’s van Openfire slagen vaak niet in deze test, zelfs als "
 "ze wel werken."
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Antwoorden op ontvangsbevestigingen"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Verzonden ontvangstbevestigingen"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Laat Gajim toe informatie te versturen over het besturingssysteem dat je "
 "gebruikt."
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "Gajim toelaten je lokale tijd te sturen."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5869,11 +6082,11 @@ msgstr ""
 "Moet Gajim bij het onderhandelen van een versleutelde sessie ervan uitgaan "
 "dat je wil dat je berichten opgeslagen worden?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "Bericht dat verzonden wordt naar contacten die je wil toevoegen"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
@@ -5881,43 +6094,55 @@ msgstr ""
 "Indien ingeschakeld en je server deze functie ondersteunt zal Gajim "
 "berichten verzonden en ontvangen door andere bronnen ook ontvangen."
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
-"Indien ingeschakeld zal Gajim je lokale IP's verzenden, zodat je contact "
-"verbinding kan maken met je apparaat om bestanden te delen."
+"Indien ingeschakeld zal Gajim je lokale IP-adressen verzenden, zodat je "
+"contact verbinding kan maken met je apparaat om bestanden te delen."
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Laatste token voor OAuth 2.0-authenticatie."
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "client_id voor OAuth 2.0-authenticatie."
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "redirect_url voor OAuth 2.0-authenticatie."
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
-"Door spaties gescheiden lijst van JID's waarmee bij volgend opstarten "
+"Door spaties gescheiden lijst van JID’s waarmee bij volgend opstarten "
 "automatisch een gespreksvenster geopend moet worden."
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr "HTTP-upload: schakel HTTPS-verificatie in"
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+"Voorkeursmechanisme voor bestandsoverdracht bij verslepen en neerzetten van "
+"bestand op gespreksvenster. Kan ‘httpupload’ (standaard) of ‘jingle’ zijn"
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Taal waarvoor gecontroleerd moet worden op verkeerd gespelde woorden"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr "De momenteel actieve versleuteling voor dat contact"
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
@@ -5926,7 +6151,7 @@ msgstr ""
 "worden bij inloggen/deelnemen. -1 betekent geen limiet, -2 betekent globale "
 "instelling"
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
@@ -5935,13 +6160,13 @@ msgstr ""
 "worden bij inloggen/deelnemen. -1 betekent geen limiet, -2 betekent globale "
 "instelling"
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 "Stel in of er voor elk bericht in dit groepsgesprek een melding moet worden "
 "getoond"
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
@@ -5951,79 +6176,79 @@ msgstr ""
 "opgeslagen bij afsluiten van Gajim). Gebruik deze optie NIET om plug-ins in "
 "of uit te schakelen, daarvoor dient de gebruikersinterface."
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Eten"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Werken"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefoon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Uit"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Ik ben buiten van het leven aan het genieten."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Ik ben aanwezig."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Ik sta open voor gesprekken."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Ik ben niet beschikbaar."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Niet storen."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Tot ziens!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6031,28 +6256,28 @@ msgstr ""
 "Geluid om af te spelen wanneer een groepsgespreksbericht je bijnaam of een "
 "van de woorden in muc_highlight_words bevat."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 "Geluid om af te spelen wanneer een bericht in een groepsgesprek toekomt."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "groen"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "kruidenier"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "menselijk"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 msgid "Tor"
 msgstr "Tor"
 
@@ -6129,36 +6354,49 @@ msgstr "Alle ongelezen berichten zijn doorgestuurd."
 msgid "Forward unread message then disconnect"
 msgstr "Ongelezen berichten doorsturen en daarna de verbinding verbreken"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Bestand is leeg"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Bestand bestaat niet"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr "Bestand is te groot, maximale bestandsgrootte is: %s"
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "logboekdatabase wordt aangemaakt"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "cachedatabase wordt aangemaakt"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "%(src)s naar %(dst)s verplaatsen"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is een bestand maar zou een map moeten zijn"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim sluit nu af"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is een map maar zou een bestand moeten zijn"
@@ -6168,11 +6406,11 @@ msgstr "%s is een map maar zou een bestand moeten zijn"
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyaan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "logboekdatabase migreren naar indices"
 
@@ -6181,190 +6419,190 @@ msgstr "logboekdatabase migreren naar indices"
 msgid "%s is not a valid loglevel"
 msgstr "%s is geen geldig logniveau"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Kan uitgever van certificaat niet ophalen"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Kan CRL van certificaat niet ophalen"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Kan certificaatsondertekening niet ontsleutelen"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Kan CRL-ondertekening niet ontsleutelen"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Kan publieke sleutel van uitgever niet ontcijferen"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Certificaatsondertekeningsfout"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "CRL-handtekeningsfout"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Certificaat is nog niet geldig"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Certificaat is verlopen"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL is nog niet geldig"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL is verlopen"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatteringsfout in notBefore-veld van certificaat"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatteringsfout in notAfter-veld van certificaat"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatteringsfout in lastUpdate-veld van CRL"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatteringsfout in nextUpdate-veld van CRL"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Geheugentekort"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Zelfgetekend certificaat"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Zelfgetekend certificaat in certificaatsketen"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Kan lokale uitgever van certificaat niet ophalen"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Kan het eerste certificaat niet verifiëren"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Certificaatketen te lang"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certificaat ingetrokken"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Ongeldig CA-certificaat"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Padlengtelimiet overschreden"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Niet-ondersteund certificaatsdoel"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certificaat niet vertrouwd"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certificaat geweigerd"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Subjectuitgever komt niet overeen"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoriteit en subjectsleutelidentificatie komen niet overeen"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoriteit en uitgeverserienummer komen niet overeen"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Sleutelgebruik bevat geen certificaatondertekening"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Toepassingsverificatie mislukt"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
-msgstr "Verbinding met account \"%s\" verbroken"
+msgstr "Verbinding met account ‘%s’ verbroken"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Handmatig opnieuw verbinden."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Server %(name)s gaf een verkeerd antwoord op het registratieverzoek: "
 "%(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s gaf een ander registratieformulier op"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
-msgstr "Kon geen verbinding maken met \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "Kon geen verbinding maken met ‘%(host)s’ via proxy ‘%(proxy)s’"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, python-format
 msgid "Could not connect to \"%(host)s\""
-msgstr "Kon geen verbinding maken met \"%(host)s\""
+msgstr "Kon geen verbinding maken met ‘%(host)s’"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server antwoordde: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Verbinding met proxy mislukt"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kon geen verbinding maken met account %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Verbinding met account %s verbroken. Probeer opnieuw te verbinden."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "De authenticiteit van het %s certificaat zou ongeldig kunnen zijn"
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6373,7 +6611,7 @@ msgstr ""
 "\n"
 "SSL-fout: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6382,7 +6620,7 @@ msgstr ""
 "\n"
 "Onbekende SSL-fout: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -6391,32 +6629,32 @@ msgstr ""
 "De authenticiteit van het %s certificaat kan ongeldig zijn.\n"
 "Het certificaat is niet geldig voor dit domein."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
-msgstr "Kon geen verbinding maken met \"%s\""
+msgstr "Kon geen verbinding maken met ‘%s’"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
-msgstr "Inloggen mislukt met \"%s\""
+msgstr "Authenticatie met ‘%s’ mislukt"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Contact verzonden: ‘%(jid)s’ (%(name)s)"
 
 # Verzonden aan contacten?
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Verzonden contacten:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Niet opgehaald door status ‘onzichtbaar’"
 
@@ -7232,7 +7470,7 @@ msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 msgstr ""
-"<b>\"%(title)s\"</b> door <i>%(artist)s</i>\n"
+"<b>‘%(title)s’</b> door <i>%(artist)s</i>\n"
 "van <i>%(source)s</i>"
 
 #: gajim/common/stanza_session.py:422
@@ -7283,233 +7521,257 @@ msgstr "video-invoer"
 msgid "video output"
 msgstr "video-uitvoer"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Server moet tussen 1 en 1023 bytes lang zijn"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Ongeldig teken in hostnaam."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Server adres vereist."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Gebruikersnaam moet tussen 1 en 1023 bytes lang zijn"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Ongeldig teken in gebruikersnaam."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Bron moet tussen 1 en 1023 bytes lang zijn"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Ongeldig teken in bron."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Niet beschikbaar"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "Open voor _gesprek"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "?gebruikersstatus:_Aanwezig"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Offline"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?contact heeft status:Onbekend"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?contact heeft status:Heeft fouten"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Abonnement dat we al hebben:Geen"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Aan"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Van"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Beide"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Vragen (voor abonnering):Geen"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Contactrol voor groepsgesprek:Geen"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 msgid "is composing a message…"
 msgstr "is een bericht aan het typen…"
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tabblad gesloten"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
 # Kan beter.
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d bericht in afwachting"
 msgstr[1] "%d berichten in afwachting"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, python-format
 msgid "from room %s"
 msgstr "van groepsgesprek %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, python-format
 msgid "from user %s"
 msgstr "van gebruiker %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, python-format
 msgid "from %s"
 msgstr "van %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d lopende gebeurtenis"
 msgstr[1] "%d lopende gebeurtenissen"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Ik wil je graag toevoegen aan mijn contacten."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "Hallo, ik ben $name."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Time-out bij laden van afbeelding"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Afbeelding is te groot"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr "PyCURL is niet geïnstalleerd"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 msgid "Error loading image"
 msgstr "Fout bij laden van afbeelding"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Transport %s heeft niet op tijd geantwoord met registratie informatie"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr "Dit bericht is versleuteld met OTR en kon niet ontsleuteld worden."
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
@@ -7517,23 +7779,23 @@ msgstr ""
 "Dit bericht is versleuteld met Legacy OpenPGP en kon niet ontsleuteld "
 "worden. Installeer de PGP-plug-in om deze berichten te verwerken."
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 "Dit bericht is versleuteld met OpenPGP voor XMPP en kon niet ontsleuteld "
 "worden."
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr "Dit bericht is versleuteld met %s en kon niet ontsleuteld worden."
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "bericht"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
@@ -7571,43 +7833,43 @@ msgstr ""
 "Systeembus is niet beschikbaar.\n"
 "Lees %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Controleer of Avahi of Bonjour is geïnstalleerd."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Kon lokale dienst niet starten"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Kan niet binden aan poort %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Controleer of avahi-daemon draait."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kon status van account ‘%s’ niet veranderen"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Je bericht kan niet worden verzonden."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Je bericht kan niet worden verzonden."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7648,41 +7910,36 @@ msgid "_Reset to default"
 msgstr "He_rstellen naar standaardwaarden"
 
 #: gajim/data/gui/join_groupchat_window.ui:34
-#, fuzzy
 msgid "Bookmark this Groupchat"
-msgstr "Dit groepsgesprek toevoegen aan _bladwijzers"
+msgstr "Dit groepsgesprek toevoegen aan bladwijzers"
 
 #: gajim/data/gui/join_groupchat_window.ui:51
 msgid "Join this Groupchat everytime Gajim is started"
-msgstr ""
+msgstr "Deelnemen aan dit groepsgesprek bij opstarten van Gajim"
 
 #: gajim/data/gui/join_groupchat_window.ui:69
-#, fuzzy
 msgid "Bookmark"
-msgstr "Toevoegen aan _bladwijzers"
+msgstr "Toevoegen aan bladwijzers"
 
 #: gajim/data/gui/join_groupchat_window.ui:82
-#, fuzzy
 msgid "Autojoin"
-msgstr "A_utomatisch binnengaan"
+msgstr "Automatisch deelnemen"
 
 #: gajim/data/gui/join_groupchat_window.ui:119
 msgid "Account"
 msgstr "Account"
 
 #: gajim/data/gui/join_groupchat_window.ui:226
-#, fuzzy
 msgid "Room"
-msgstr "Groepsgesprek:"
+msgstr "Groepsgesprek"
 
 #: gajim/data/gui/join_groupchat_window.ui:238
-#, fuzzy
 msgid "Recently"
-msgstr "Recent:"
+msgstr "Recent"
 
 #: gajim/data/gui/join_groupchat_window.ui:290
 msgid "Search the rooms on this server"
-msgstr ""
+msgstr "Doorzoek de groepsgesprekken op deze server"
 
 #: gajim/data/gui/manage_proxies_window.ui:12
 msgid "HTTP Connect"
@@ -7849,6 +8106,10 @@ msgstr "Ver_bannen"
 msgid "_Add to Roster"
 msgstr "Toevoegen _aan roster"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+msgid "_Execute command"
+msgstr "_Opdracht uitvoeren"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8122,11 +8383,11 @@ msgstr "Info"
 msgid "Con_tinue"
 msgstr "_Doorgaan"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pauze"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Annuleren"
@@ -8135,33 +8396,33 @@ msgstr "_Annuleren"
 msgid "_Open Containing Folder"
 msgstr "_Open bovenliggende map"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Bestandsoverdrachten"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "bestandsoverdrachtlijst"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Ruim _op"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Verwijdert afgeronde, geannuleerde en mislukte bestandsoverdrachten van de "
 "lijst"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Verwijder bestandsoverdracht van de lijst."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8169,33 +8430,37 @@ msgstr ""
 "Deze actie verwijdert een enkele bestandsoverdracht van de lijst. Als de "
 "overdracht actief is, wordt hij eerst gestopt en dan verwijdert"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Annuleert de geselecteerde bestandsoverdracht en verwijdert onvolledige "
 "bestanden"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Bestandsoverdracht annuleren"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Annuleert de geselecteerde bestandsoverdracht"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+msgid "_Close"
+msgstr "S_luiten"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Verbergt het venster"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Laat een pop-up zien als een bestandsoverdracht voltooid is"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Laat een lijst met bestandsoverdrachten zien tussen jou en anderen"
 
@@ -8204,7 +8469,7 @@ msgid "Register to"
 msgstr "Registreren bij"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Oké"
 
@@ -8234,19 +8499,19 @@ msgstr "Lettertype"
 msgid "Clear formatting"
 msgstr "Opmaak wissen"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Een lijst van emoticons weergeven (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 msgid "Choose an encryption"
 msgstr "Kies een versleutelingstype"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Een lijst van emoticons weergeven (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "Gebeurtenistype"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "Gebeurtenisbeschrijving"
 
@@ -8298,7 +8563,7 @@ msgstr "<b>0</b>"
 msgid "<b>#</b>"
 msgstr "<b>#</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -8372,7 +8637,7 @@ msgstr "Gespreksbanner"
 
 #: gajim/data/gui/gajim_themes_window.ui:28
 msgid "Gajim Themes Customization"
-msgstr "Gajim thema's aanpassen"
+msgstr "Gajim – thema’s aanpassen"
 
 #: gajim/data/gui/gajim_themes_window.ui:157
 msgid "Text _color:"
@@ -8424,7 +8689,7 @@ msgstr "<b>Gesprekstoestand kleuren voor tabbladen</b>"
 
 #: gajim/data/gui/preferences_window.ui:48
 msgid "Use default applications"
-msgstr "Standaardprogramma's gebruiken"
+msgstr "Standaardprogramma’s gebruiken"
 
 #: gajim/data/gui/preferences_window.ui:51
 msgid "Custom"
@@ -8543,8 +8808,8 @@ msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 msgstr ""
-"Indien uitgevinkt zal Gajim ascii-smilies, zoals ':)', vervangen door "
-"bijpassende geanimeerde of statische grafische emoticons"
+"Indien niet uitgeschakeld zal Gajim ascii-smileys, zoals ‘:)’, vervangen "
+"door bijpassende geanimeerde of statische grafische emoticons"
 
 #: gajim/data/gui/preferences_window.ui:390
 msgid "_Emoticons:"
@@ -9030,10 +9295,6 @@ msgstr "_Openen…"
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Geavanceerde configuratie</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Geavanceerd"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "_Gesprek beginnen"
@@ -9271,7 +9532,7 @@ msgid "_Open Email Composer"
 msgstr "E-mailopsteller _openen"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "Ge_sprek beginnen"
 
@@ -9313,6 +9574,10 @@ msgstr "Voorkeur"
 msgid "Default:"
 msgstr "Standaard:"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr "<b><big>Inkomende oproep</big></b>"
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Nieuw contact toevoegen"
@@ -9338,6 +9603,14 @@ msgstr "Bij_naam:"
 msgid "_Group:"
 msgstr "_Groep:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+msgid "Type User ID"
+msgstr "Voer gebruikers-ID in"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+msgid "Type Nickname"
+msgstr "Voer bijnaam in"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr "Kies een groep of voer een nieuwe groep in"
@@ -9374,6 +9647,10 @@ msgstr ""
 "Je moet met het transport verbonden zijn om\n"
 "een contact van dit protocol toe te voegen."
 
+#: gajim/data/gui/roster_window.ui:61
+msgid "Change Status Message…"
+msgstr "Statusbericht wijzigen…"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Stemming:</b>"
@@ -9558,7 +9835,7 @@ msgstr "Even geduld…"
 
 #: gajim/data/gui/adhoc_commands_window.ui:257
 msgid "This jabber entity does not expose any commands."
-msgstr "Deze jabberentiteit biedt geen commando's aan."
+msgstr "Deze jabberentiteit biedt geen opdrachten aan."
 
 #: gajim/data/gui/adhoc_commands_window.ui:336
 msgid "<b>An error has occurred:</b>"
@@ -9588,10 +9865,9 @@ msgstr "Opdracht uitvoer_en…"
 msgid "_Verify"
 msgstr "Ver_ifiëren"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Accounts"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b>-info)"
 
 #: gajim/data/gui/application_menu.ui:8
 msgid "View"
@@ -9613,10 +9889,6 @@ msgstr "Alleen actieve contacten weergeven"
 msgid "Show Transports"
 msgstr "Transporten weergeven"
 
-#: gajim/data/gui/application_menu.ui:32
-msgid "File Transfer"
-msgstr "Bestandsoverdracht"
-
 #: gajim/data/gui/application_menu.ui:43
 msgid "Help"
 msgstr "Hulp"
@@ -9683,48 +9955,33 @@ msgstr "Minimali_seren bij automatisch deelnemen"
 msgid "Pr_int status:"
 msgstr "Pr_int status:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-msgid "Exception"
-msgstr "Uitzondering"
-
-#: gajim/data/gui/exception_dialog.ui:44
-msgid "Report Bug"
-msgstr "Fout melden"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
-"Er is een programmeerfout opgetreden.\n"
-"Het is waarschijnlijk niet fataal, maar het is een goed idee toch\n"
-"de ontwikkelaars op de hoogte te stellen."
+"Er is een programmeerfout opgetreden. Het is waarschijnlijk niet fataal, "
+"maar het is een goed idee toch de ontwikkelaars op de hoogte te stellen."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Abonneringsverzoek"
+#: gajim/data/gui/exception_dialog.ui:115
+msgid "Report Bug"
+msgstr "Fout melden"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Weigeren"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Geef contact geen toestemming om te zien of je online bent"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Acties"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Mach_tigen"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Geef contact toestemming om te zien of je online bent"
 
@@ -9740,11 +9997,11 @@ msgstr "Iq"
 msgid "Presets"
 msgstr "Voorinstellingen"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Nodig vrienden uit!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
@@ -9752,15 +10009,20 @@ msgstr ""
 "Je staat op het punt een groepsgesprek binnen te gaan.\n"
 "Kies de contacten die je wil uitnodigen"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr "kolom"
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Kies een MUC-server."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC-server"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Uit_nodigen"
 
@@ -9869,10 +10131,6 @@ msgstr "Omhoog scrollen"
 msgid "Scroll down"
 msgstr "Omlaag scrollen"
 
-#: gajim/data/gui/shortcuts_window.ui:113
-msgid "Clear"
-msgstr "Wissen"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr "Tabbladen"
@@ -10023,6 +10281,14 @@ msgstr "Toon alle wachtende gebeurt_enissen"
 msgid "Mute Sounds"
 msgstr "Geluiden dempen"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+msgid "_Preferences"
+msgstr "_Voorkeuren"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr "_Afsluiten"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Aan:"
@@ -10320,9 +10586,8 @@ msgid "Invited %(jid)s to %(room_jid)s"
 msgstr "%(jid)s uitgenodigd in %(room_jid)s"
 
 #: gajim/command_system/implementation/standard.py:299
-#, fuzzy
 msgid "Join a group chat given by a jid"
-msgstr "Deelnemen aan groepsgesprek"
+msgstr "Deelnemen aan groepsgesprek met JID"
 
 #: gajim/command_system/implementation/standard.py:307
 msgid ""
@@ -10439,14 +10704,6 @@ msgstr "Overschrijven?"
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr "URI openen met Gajim"
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr "chat;messaging;berichten;gesprek;im;jabber;xmpp;bonjour;voip;"
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber-IM-cliënt"
@@ -10573,6 +10830,35 @@ msgstr "Gespreksgeschiedenis"
 msgid "Plugin manager"
 msgstr "Plug-inbeheer"
 
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP-account %s"
+
+#~ msgid "Exception"
+#~ msgstr "Uitzondering"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>iemand@ergens.be</b> wil dat je een aantal contacten aan je rooster "
+#~ "<b>toevoegt</b>."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Geordende lijst (door spaties geschieden) van te proberen "
+#~ "verbindingstypes. Kan ‘tls’, ‘ssl’ of ‘plain’ zijn"
+
+#~ msgid "_Actions"
+#~ msgstr "_Acties"
+
+#~ msgid "Open URI using Gajim"
+#~ msgstr "URI openen met Gajim"
+
+#~ msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+#~ msgstr "chat;messaging;berichten;gesprek;im;jabber;xmpp;bonjour;voip;"
+
 #~ msgid "UPower"
 #~ msgstr "UPower"
 
@@ -10783,12 +11069,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Gespreksknoppen verbergen"
 
-#~ msgid "File is empty"
-#~ msgstr "Bestand is leeg"
-
-#~ msgid "File does not exist"
-#~ msgstr "Bestand bestaat niet"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10821,51 +11101,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "Vereist python-pyopenssl > 0.12 en pyasn1."
 
-#~ msgid "?user status:_Available"
-#~ msgstr "?gebruikersstatus:_Aanwezig"
-
-#~ msgid "?user status:Available"
-#~ msgstr "?gebruikersstatus:Aanwezig"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?contact heeft status:Onbekend"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?contact heeft status:Heeft fouten"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Abonnement dat we al hebben:Geen"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Vragen (voor abonnering):Geen"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Contactrol voor groepsgesprek:Geen"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Aansluiting van contact in groepsgesprek:Geen"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Alles"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Geen"
-
-#~ msgid "?features:Available"
-#~ msgstr "?functies:Beschikbaar"
-
-#~ msgid "?CLI:account"
-#~ msgstr "?CLI:account"
-
-#~ msgid "?CLI:status"
-#~ msgstr "?CLI:status"
-
-#~ msgid "?CLI:message"
-#~ msgstr "?CLI:bericht"
-
-#~ msgid "?CLI:priority"
-#~ msgstr "?CLI:prioriteit"
-
 #~ msgid "?CLI:uri"
 #~ msgstr "?CLI:uri"
 
@@ -10878,30 +11113,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "?CLI:password"
 #~ msgstr "?CLI:wachtwoord"
 
-#~ msgid "?Noun:Chats"
-#~ msgstr "?Znw:Gesprekken"
-
-#~ msgid "?Noun:Download"
-#~ msgstr "?Znw:Download"
-
-#~ msgid "?Noun:Upload"
-#~ msgstr "?Znw:Upload"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?overdrachtstatus:Gepauzeerd"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Cliënt:Onbekend"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Onbekend"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Tijd:Onbekend"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "?Rol in groepsgesprek:<b>Rol:</b>"
-
 #~ msgid "Credentials"
 #~ msgstr "Gebruikersreferenties"
 
@@ -11124,9 +11335,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "Choose _Key..."
 #~ msgstr "Sleutel _kiezen…"
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "G_PG-agent gebruiken"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11271,15 +11479,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML-invoer</b>"
 
-#~ msgid "Filter"
-#~ msgstr "Filteren"
-
-#~ msgid "XML Input"
-#~ msgstr "XML-invoer"
-
-#~ msgid "Send"
-#~ msgstr "Verzenden"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML-console voor %s"
 
@@ -11704,10 +11903,6 @@ msgstr "Plug-inbeheer"
 #~ msgstr "Contacten uitnodigen in gesprek (Ctrl+G)"
 
 #, fuzzy
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Beschrijving</b>"
-
-#, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Contactnaam"
 
@@ -11723,13 +11918,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "homepage url"
 #~ msgstr "Website:"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>iemand@ergens.be</b> wil dat je een aantal contacten aan je rooster "
-#~ "<b>toevoegt</b>."
-
 #~ msgid "More"
 #~ msgstr "Meer"
 
@@ -11757,13 +11945,6 @@ msgstr "Plug-inbeheer"
 #~ "Voeg dit certificaat toe aan de lijst van vertrouwde certificaten.\n"
 #~ "SHA1-vingerafdruk van het certificaat:\n"
 
-#~ msgid ""
-#~ "<b>Message was corrected. Last message was:</b>\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "<b>Bericht is gewijzigd. Vorig bericht was:</b>\n"
-#~ "  %s"
-
 #, fuzzy
 #~ msgid "PyGTK Version:"
 #~ msgstr "GTK+-versie:"
@@ -12372,10 +12553,6 @@ msgstr "Plug-inbeheer"
 #~ msgstr "Deze contact staat al op je rooster"
 
 #, fuzzy
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP: "
-
-#, fuzzy
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Bestandsoverdracht gestopt door andere gebruiker"
 
@@ -12405,12 +12582,6 @@ msgstr "Plug-inbeheer"
 #~ "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
 #~ "gebruiken. (bijv. /%s loopt...)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Versleuteling ingeschakeld"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Versleuteling uitgeschakeld"
-
 #, fuzzy
 #~ msgid "_Retype Password:"
 #~ msgstr "_Wachtwoord:"
diff --git a/po/pl.po b/po/pl.po
index d66b7f24a..6a8aa8209 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2013-09-02 10:44+0100\n"
 "Last-Translator: Michał Olber <michal.olber@osworld.pl>\n"
 "Language-Team: Polish <dominik@kozaczko.info, translation-team-pl@lists."
@@ -31,20 +31,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Błąd."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Na pewno wysłać ten plik?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Jeżeli wyślesz plik do %s, pozna on/ona twój pełny JID."
@@ -101,70 +101,70 @@ msgstr "Czas"
 msgid "Progress"
 msgstr "Postęp"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Ty"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisane w: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Otwórz katalog zawierający ten plik"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Przesyłanie pliku anulowane"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Nie można ustanowić połączenia z drugą stroną."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Odbiorca: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Komunikat błędu: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -172,127 +172,127 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Wybierz plik do wysłania..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Opis: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim nie może uzyskać dostępu do tego pliku"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Istnieje już plik o tej nazwie a Ty nie masz uprawnień do jego nadpisania."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Nie masz uprawnień do zapisu w folderze \"%s\""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Zapisz obraz jako..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Wysyłanie profilu..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Błąd przesyłania pliku"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Plik: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -453,45 +453,66 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Wymaga python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Dostępny"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Możliwości"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Błąd odczytu pliku:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Błąd przetwarzania pliku:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Obraz nie może zostać zapisany w formacie %(type)s. Zapisać jako "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Zapisz plik jako..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "rozmawiam "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Klient: Nieznany"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?System operacyjny: Nieznany"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Czas: Nieznany"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Grupy:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -500,7 +521,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz się jego/jej statusem."
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -509,39 +530,49 @@ msgstr ""
 "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Oczekujesz na odpowiedź kontaktu dotyczącą prośby o autoryzację"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Nie ma oczekujących żądań autoryzacji."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Wszystkie pliki"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Sprzątam"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Zarządzaj Profilami Proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -584,13 +615,13 @@ msgid "_New Group Chat"
 msgstr "_Nowa rozmowa grupowa"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
@@ -603,7 +634,7 @@ msgstr "Chciałbym dodać Cię do listy kontaktów"
 msgid "Send Single _Message…"
 msgstr "Wyślij _wiadomość"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Wyślij odrębny status"
@@ -621,25 +652,25 @@ msgstr "_Zarządzaj transportami"
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Zmień nazwę"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Cofnij blokadę"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Zablokuj"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Us_uń"
@@ -653,205 +684,225 @@ msgstr "Informacje o kontakcie"
 msgid "Send File..."
 msgstr "Wyślij _plik..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Zaproś kontakty"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "Dod_aj do listy kontaktów"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "Test audio"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "Video test"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Informacje o kontakcie"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historia"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Zarządzaj pokojem"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Zmień _temat..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Konfiguruj _pokój..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Zlikwiduj pokój"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Zmień pseudo_nim..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "_Dodaj zakładkę do tego pokoju"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Głos"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Szablony opisów:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimalizuj przy zamknięciu"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Wykonaj komendę"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Rozłącz"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "plik"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Wyszukuj usługi"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Wyślij _wiadomość..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Ustawienia"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synchronizuj"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Serwer"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Administrator"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Wyślij wiadomość do serwera..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Ustaw MOTD"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Uaktualnij MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Usuń MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Konta"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "Wiadomość"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Emotikony:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Nie można odnaleźć bazy danych z historią rozmów"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Data"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Wiadomość"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Temat"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -859,7 +910,7 @@ msgstr ""
 "Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ "
 "OPCJI GDY GAJIM JEST URUCHOMIONY)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -875,98 +926,98 @@ msgstr ""
 "\n"
 "Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Błąd bazy danych"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Przenoszenie logów rozmów..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o godzinie %(time)s napisał: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Czy na pewno chcesz usunąć wybraną wiadomość?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Czy na pewno chcesz usunąć historię rozmów wybranego kontaktu?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Nie można odnaleźć usługi"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Cofnij potwierdzenie"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Czy na pewno chcesz usunąć wybraną wiadomość?"
 msgstr[1] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 msgstr[2] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Skutków tej operacji nie można będzie wycofać."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Pobieranie profilu..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "Nieprawidłowy format daty"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Data musi być podana w formacie RRRR-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informacja została odebrana"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Nie możesz wysłać informacji o sobie jeśli nie jesteś połączony."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Wysyłanie profilu..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informacja NIE ZOSTAŁA opublikowana"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -984,10 +1035,10 @@ msgstr "Nazwa kontaktu: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Ogólne"
@@ -1074,36 +1125,36 @@ msgstr "Wypełnij informacje o kontakcie, który chcesz dodać do konta %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Ty nie możesz dodać siebie do swojej listy kontaktów."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Błąd przy dodawaniu usługi %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1111,50 +1162,50 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Klient Jabbera w GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Wersja GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Wersja PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Bieżący deweloperzy:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Poprzedni deweloperzy:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "I wreszcie, chcielibyśmy podziękować wszystkim opiekunom pakietów."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Tłumaczenie na język polski: Witold Kieraś\n"
@@ -1163,12 +1214,12 @@ msgstr ""
 "Dominik Kozaczko <dominik@kozaczko.info>\n"
 "Jacek Sowiński <mruwek@mruwek.pl>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1180,12 +1231,12 @@ msgstr ""
 "inny język korzystać z opcji speller_langugage.\n"
 "Do tego czasu podświetlanie błędnie wpisanych słów nie będzie działało"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1197,280 +1248,304 @@ msgstr ""
 "To oznacza, że wszystkie twoje rozmowy będą przebiegać niezaszyfrowane."
 "Jesteś pewien, że chcesz to zrobić?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim nie nawiąże połączenia, jeżeli nie będzie zaznaczone to pole"
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "_Przywróć"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "Zastąp"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Prośba o autoryzację"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Prośba o autoryzację dla konta %(account)s od %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Dołącz do pokoju"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Niepoprawny pokój"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Proszę utworzyć nowy temat i nadać mu nazwę."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Błędny adres URI"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "To nie jest czat"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nazwa"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Serwer"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Nie możesz synchronizować kontaktów z kontem, które nie jest połączone."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Kontynuacja rozmowy"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Nowa rozmowa grupowa"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Dodaj nowy kontakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Nie możesz zmienić hasła, jeśli nie jesteś połączony."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Od %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Niemożna wysłać wiadomości do %s, JID jest nieprawidłowy."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Sprzątam"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtr:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Wejście XML</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Wyślij"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "dodaj"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "modyfikuj"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "usuń"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1478,28 +1553,28 @@ msgid ""
 msgstr ""
 "<b>%(jid)s</b> chciałby <b>%(action)s</b> kilka kontaktów w Twoim rosterze."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Dodaj"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Edytuj"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Usuń"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Grupy"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s zasugerował(a), żebym dodał Cię do rostera."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1507,7 +1582,7 @@ msgstr[0] "Dodano %s kontaktów"
 msgstr[1] "Dodano %s kontaktów"
 msgstr[2] "Dodano %s kontaktów"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1515,179 +1590,179 @@ msgstr[0] "Usunięto %s kontaktów"
 msgstr[1] "Usunięto %s kontaktów"
 msgstr[2] "Usunięto %s kontaktów"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Zachowanie Ustawień dla %s"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "Zachowanie Ustawień dla %s"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Wystąpił błąd"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Błąd"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Poufna Lista"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Kolejność: %(order)s, akcja: %(action)s, typ: %(type)s, wartość: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Kolejność: %(order)s, akcja: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasza cię do rozmowy"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasza cię do pokoju %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr "Powód (jeżeli odmowa):"
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "Proszę wybrać certyfikat klienta #PCKS12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "Pliki PKCS12"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Obrazki"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Wybierz archiwum"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "Archiwa Zip"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "wideo-głosową"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "głosową"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "wideo"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s chce rozpocząć z Tobą rozmowę %(type)s. Chcesz odebrać?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "dla konta %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1711,68 +1786,96 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Błąd certyfikatu SSL"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 #, fuzzy
 msgid "View cert…"
 msgstr "Pokaż certyfikat..."
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Przesyłane pliki"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Szyfrowanie E2E wyłączone"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s występuje teraz jako %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Nie jesteś już w pokoju \"%(room)s\" lub \"%(nick)s\" opuścił go."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Niepoprawny Jabber ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1781,255 +1884,265 @@ msgstr ""
 "Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "oraz NIE autoryzowana"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s szyfrowanie %(status)s aktywne %(authenticated)s.\n"
 "Twoja sesja %(logged)s będzie logowana."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Rozmowa z"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s ustawił temat na %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Lista zawiera teraz niedostępnych uczestników"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "lista nie zawiera teraz niedostępnych użytkowników"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Pokój nie jest już anonimowy"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Pokój jest teraz quasi-anonimowy"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s został wyrzucony z pokoju: %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 "Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s został zabanowany przez %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s został wyrzucony z pokoju: %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "zamknięcie systemu"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s przez "
 "%(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 "** Uprawnienia użytkownika %(nick)s zostały zmieniona na %(role)s przez "
 "%(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uprawnienia użytkownika %(nick)s została zmienione na %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Jeśli zamkniesz to okno, połączenie z tym pokojem zostanie zerwane."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Przesyłane pliki"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Przesyłane pliki"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Pokaż formatowanie tekstu"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ten kontakt nie może przesyłać i odbierać plików."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pokoju %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Negocjowanie sesji zostało przerwane"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "Obecna sesja zostanie zachowania w archiwum na serwerze"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Ta sesja NIE BĘDZIE archiwizowana na serwerze"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr "i BĘDZIE logowana"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr "i NIE BĘDZIE logowana"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2037,16 +2150,16 @@ msgstr ""
 "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk "
 "tarczy po więcej szczegółów."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2054,7 +2167,7 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2063,7 +2176,7 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2072,98 +2185,98 @@ msgstr ""
 "Nie można odszyfrować wiadomości od %s\n"
 "To mogło być sfałszowane."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ma teraz status %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Przesyłane pliki"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Rozmiar: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Akceptuj"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Druga strona przerwała transfer"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Błąd odczytu pliku"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Pokoje"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transporty"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autoryzacja została wysłana"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
 "status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Teraz \"%s\" zawsze będzie cię widział jako rozłączonego."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG nie nadaje się do użycia"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2171,11 +2284,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2183,38 +2296,38 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "rozsynchronizowany"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Na pewno zamknąć Gajima?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Na pewno chcesz opuścić program?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Zawsze zamykaj Gajima"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Usuwa transfer pliku"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2222,16 +2335,16 @@ msgstr ""
 "Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz "
 "włączoną obsługę historii."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2239,11 +2352,11 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2252,11 +2365,11 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "następujących transportów: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Czy na pewno chcesz zablokować kontakt?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2265,57 +2378,57 @@ msgstr ""
 "Ten kontakt będzie Cię widział jako rozłączonego. Nie otrzymasz też od niego "
 "żadnych komunikatów."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Czy chcesz usunąć z rostera grupę %s?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Usuń z rostera wszystkie kontakty należące do tej grupy"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" zostanie usunięty z Twojej listy kontaktów"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Ty zamierzasz usunąć \"%(name)s\" (%(jid)s) ze swojej listy kontaktów.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2325,11 +2438,11 @@ msgstr ""
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Czy chcesz kontynuować?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2338,15 +2451,15 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako rozłączonego."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Chcę żeby po usunięciu ten kontakt znał mój status"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2356,37 +2469,37 @@ msgstr ""
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Chcesz ustawić indywidualny status. Na pewno chcesz kontynuować?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Aby rozmawiać z innymi osobami musisz założyć konto Jabbera."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2395,12 +2508,12 @@ msgstr ""
 "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
 "zostanie przywrócona podczas następnego połączenia."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2410,11 +2523,11 @@ msgstr ""
 "rostera. Używa się ich przede wszystkim wtedy, gdy jedna osoba ma kilka kont "
 "Jabbera lub zarejestrowana jest w kilku transportach."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2422,184 +2535,184 @@ msgstr[0] "Czy chcesz wysłać ten plik do %s:"
 msgstr[1] "Czy chcesz wysłać te pliki do %s:"
 msgstr[2] "Czy chcesz wysłać te pliki do %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Wyślij %s do %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Przekształć %s oraz %s w metakontakty"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publikuj Utwór"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Konfiguruj Usługi..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Za_proś do"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Modyfikuj _grupy"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Połącz ponownie"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Rozłącz"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historia"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Zmień opis statusu"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Pokaż ikonę w obszarze powiadomienia:"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Pokaż tylko na liście kontaktów"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Edytor zaawansowanych ustawień"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s błąd konfiguracji"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Configure logging system"
 msgstr "Konfiguruj"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Błąd bazy danych"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Łączę się"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Prześlij dalej nieprzeczytane wiadomości"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2608,7 +2721,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2616,7 +2729,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2761,16 +2874,16 @@ msgstr "Konto jest wyłączone"
 msgid "To unregister from a server, account must be enabled."
 msgstr "Aby wyrejestrować się z serwera, konto musi być włączone."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Hasło wymagane"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz swoje hasło dla konta %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Zapisz hasło"
 
@@ -2801,10 +2914,18 @@ msgstr "Usuń tylko z Gajima"
 msgid "Don't remove anything. I'll try again later"
 msgstr "Nic nie usuwaj. Spróbuję ponownie później"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Wszystkie"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Żaden"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
@@ -2868,11 +2989,11 @@ msgstr "Niepoprawny wpis"
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2978,90 +3099,112 @@ msgstr "Podświetlenie wiadomości z czatu"
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tego pokoju"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Powiązanie kontaktu z czata: brak"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Uczestnik"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Właściciel"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [zablokowany]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [zminimalizowany]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Połączony"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Rozłączony"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Pobieranie"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Prześlij"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Typ: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Ukończony"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?status transferu:wstrzymany"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "?user status:Dostępny"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Zaraz wracam"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Zajęty"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Nieobecny"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Rozłączony"
 
@@ -3110,123 +3253,127 @@ msgstr "(Brak)"
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historia rozmowy z %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historia rozmowy"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Błąd zapisu lub odczytu na dysku"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s jes teraz %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Błąd: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Błąd"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Obecny status: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Zmień opis statusu"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Zarządzaj zakładkami"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "Ukryj _listę kontaktów"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Pokaż _listę kontaktów"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "Nie można załadować obrazka"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nieobsługiwany typ pliku: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "To pole jest wymagane"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "nowy@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nowy%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Nazwa hosta: "
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Możliwości serwerów"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Serwer odpowiedział: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3384,7 +3531,7 @@ msgstr "_Autoryzuj"
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzację"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3392,51 +3539,60 @@ msgstr ""
 "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju\n"
 "od momentu gdy ostatni raz odwiedziłeś/odwiedziłaś ten pokój"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Cytuj"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "W URL-u słownika brakuje \"%s\" i nie jest to WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr "URL:"
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Niepoprawny JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+#, fuzzy
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+"<b>Poprawna wiadomość. Ostatnia:</b>\n"
+"  %s"
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3449,30 +3605,35 @@ msgstr[2] "%i dni temu"
 msgid "Write a message.."
 msgstr "Odbierz wiadomość"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Ty zamierzasz zamknąć wszystkie zakładki"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Czaty"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3484,108 +3645,108 @@ msgstr ""
 "innego w pokoju %s.\n"
 "Podaj inny pseudonim:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "W przypadku konfliktu zawsze używaj tego pseudonimu"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Czy akceptujesz tę prośbę na koncie %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autoryzacja HTTP (%(method)s) dla %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Aby dołączyć do pokoju %s wymagane jest hasło. Proszę je wpisać"
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Czcionka</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Zostałeś zabanowany w pokoju %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Pokój %s nie istnieje."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Pokój %s nie istnieje."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Twój pseudonim musi być używany w pokoju %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nie jesteś na liście uczestników rozmów w pokoju %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Błąd %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Prośba o autoryzację"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Obserwatorzy"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3594,31 +3755,31 @@ msgstr ""
 "Zawsze będziesz widział ten kontakt jako rozłączony.\n"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Cofnij autoryzację"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3627,36 +3788,36 @@ msgstr ""
 "Skonfigurowałeś Gajima by używał agenta GPG, ale agent nie jest uruchomiony "
 "lub zwraca błędne hasło.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Błędne hasło"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Błędne hasło"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certyfikat wygasł"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3665,77 +3826,82 @@ msgstr ""
 "Klucz GPG używany do szyfrowania tej rozmowy nie jest zaufany. Czyn naprawdę "
 "chcesz zaszyfrować tą wiadomość?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Błąd certyfikatu SSL"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Przesyłane pliki"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Przesłałeś plik %(filename)s do %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Wybierz plik do wysłania..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Nie można odszyfrować wiadomości"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3743,20 +3909,20 @@ msgstr ""
 "Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę "
 "podać nowy zasób"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce rozpocząć rozmowę głosową."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Prośba o rozmowę głosową"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Błąd podczas weryfikacji certyfikatu SSL"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3767,7 +3933,7 @@ msgstr ""
 "%(error)s\n"
 "Czy ciagle chcesz się połączyć z serwerem?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3780,15 +3946,15 @@ msgstr ""
 "Odcisk klucza SHA1 certyfikatu:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignoruj komunikat o tym błędzie."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3809,7 +3975,7 @@ msgstr ""
 "\n"
 "Czy nadal chcesz połączyć się i zaktualizować odcisk klucza certyfikatu?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3817,7 +3983,7 @@ msgstr ""
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. "
 "Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3825,16 +3991,16 @@ msgstr ""
 "Zamierzasz wysłać swoje hasło wykorzystując niezabezpieczone połączenie. "
 "Jesteś pewien, że chcesz to zrobić?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "To nie jest czat"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Emotoikony wyłączone"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3842,7 +4008,7 @@ msgstr ""
 "Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą "
 "wyłączone."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3851,11 +4017,11 @@ msgstr ""
 "Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą "
 "wyłączone."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3863,41 +4029,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "domyślny"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Klucz GPG stracił ważność"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Twój klucz GPG stracił ważność, zostaniesz połączony z %s bez OpenGPG"
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
@@ -3970,6 +4136,11 @@ msgstr "- wiadomości będzie logowanych"
 msgid "- messages will not be logged"
 msgstr "- wiadomości nie będzie logowanych"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4002,7 +4173,7 @@ msgstr "Niepoprawny pokój"
 msgid "The form is not filled correctly."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Niewidoczny"
 
@@ -4133,6 +4304,57 @@ msgstr ""
 "%s\n"
 "Przesyłanie wiadomości między adresami link-local może nie działać poprawnie."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Nie można uruchomić usługi lokalnej"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nie można załadować obrazka."
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Usługa zwróciła komunikat błędu."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Nie można załadować obrazka."
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Szyfrowanie E2E włączone"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Połączenie jest niemożliwe"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Motyw"
@@ -4158,7 +4380,17 @@ msgstr "Nie możesz skasować obecnie używanego motywu"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Połączone konta"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Użyj Agenta G_PG"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
@@ -4182,6 +4414,11 @@ msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Usuń"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4375,51 +4612,65 @@ msgstr "Zmień hasło"
 msgid "Login Options"
 msgstr "_Emotikony:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus nie jest obecny na tej maszynie lub brak modułu dla pythona"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Wyświetla pomoc dla wybranego polecenia"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "polecenie"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w "
 "osobnej linii"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "konto"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listę zarejestrowanych kont"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Zmienia status kont lub kont"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4427,11 +4678,17 @@ msgstr ""
 "jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
 "zajęty, niewidoczny. Jeśli nie ustawiono, użyj poprzedniego statusu konta"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "wiadomość"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "informacja o statusie"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4440,16 +4697,21 @@ msgstr ""
 "zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Zmienia priorytet konta lub kont"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "priorytet"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "priorytet, jaki chcesz nadać"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4458,7 +4720,7 @@ msgstr ""
 "status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4468,30 +4730,30 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4501,119 +4763,119 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "temat"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "temat wiadomości"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Wysyła nową wiadomość na czat, w którym uczestniczysz."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o koncie"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Nazwa konta"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "plik"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "plik zostanie wysłany z tego konta, jeśli jest ono podane"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'klucz' jest nazwą opcji, 'wartość' zaś jest jej ustawianą wartością"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Usuwa opcję"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "klucz"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nazwa opcji do usunięcia"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba, że zostało wskazane konto)."
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Zwraca liczbę nieprzeczytanych wiadomości"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Wysyła własny XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML do wysłania"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4622,15 +4884,15 @@ msgstr ""
 "Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle "
 "dane do wszystkich kont"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Zmień awatar"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Obrazek"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4638,19 +4900,19 @@ msgstr ""
 "Konto, dla którego ma być ustawiony awatar; jeżeli nie jest określone, "
 "awatar zostanie ustawiony dla wszystkich kont"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Pokazuje lub ukrywa okno iptyhon"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4659,15 +4921,15 @@ msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
 "Podaj konto, na które ma zostać wysłana ta wiadomość."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim nie jest uruchomiony, nie możesz więc użyć gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4676,16 +4938,16 @@ msgstr ""
 "Użyto: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4696,7 +4958,7 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4705,7 +4967,7 @@ msgstr ""
 "Za dużo argumentów. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4882,11 +5144,6 @@ msgstr "Koniec tygodnia"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "Konto XMPP %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4911,52 +5168,52 @@ msgstr "Pokój został usunięty"
 msgid "You can join this room instead: %s"
 msgstr "W zamian możesz dołączyć do pokoju %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nieznany błąd SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nowa wiadomość prywatna z pokoju %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Spoza listy kontaktów"
 
@@ -5800,71 +6057,67 @@ msgstr ""
 "Czy Gajim powinien automatycznie zaczynać zaszyfrowaną sesje jeśli to "
 "możliwe?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów połączeń. "
-"Może zawierać tls, ssl lub plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Pokaż ostrzeżenie przed użyciem standardowej biblioteki SSL."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 "Lista błędów (rozdzielona spacjami) zawierająca wykaz błędów ssl, które "
 "program będzie ignorował."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Wysyłanie białych znaków po nieaktywności"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "Wysyłanie pingu XMPP po nieaktywności"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5873,11 +6126,11 @@ msgstr ""
 "Czas oczekiwania (w sekundach) na odpowiedź na pakiet podtrzymujący "
 "połączenie przed podjęciem próby ponownego połączenia."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5885,21 +6138,21 @@ msgstr ""
 "Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza "
 "file_transfers_proxies i użyje ich podczas przesyłania plików."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Odpowiedź na żądanie potwierdzenia"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Wyślij żądanie potwierdzenia"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5907,12 +6160,12 @@ msgstr ""
 "Zaznaczenie tej opcji umożliwi innym wykrywanie jakiego systemu operacyjnego "
 "używasz"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s chce przesłać ci plik."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5920,148 +6173,158 @@ msgstr ""
 "Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją "
 "logować?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Wiadomość wysyłana do kontaktów, które chcesz dodać"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Używaj autoryzacji serwera proxy"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anonimowa autentykacja"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "redirect_url z autoryzacji Oauth2"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Język, którego używa słownik przy sprawdzaniu pisowni"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Praca"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6070,27 +6333,27 @@ msgstr ""
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Dźwięk, jaki będzie odtwarzany, gdy nadejdzie wiadomość MUC."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "zielony"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "human"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "morski"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Do"
@@ -6169,37 +6432,50 @@ msgstr "Wszystkie nieprzeczytane wiadomości zostały przesłane dalej."
 msgid "Forward unread message then disconnect"
 msgstr "Prześlij dalej nieprzeczytane wiadomości"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Plik jest pusty"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Plik nie istnieje."
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "tworzenie bazy danych z logami"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "tworzenie bazy danych z logami"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Wyślij %s do %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s jest plikiem choć powinien być katalogiem"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jest katalogiem choć powinien być plikiem"
@@ -6209,11 +6485,11 @@ msgstr "%s jest katalogiem choć powinien być plikiem"
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyjan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -6222,190 +6498,190 @@ msgstr "indeksowanie archiwum rozmów"
 msgid "%s is not a valid loglevel"
 msgstr "%s nie jest prawidłowym poziomem logowania"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Nie można uzyskać certyfikatu wystawcy"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Nie można uzyskać CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nie można odszyfrować podpisu certyfikatu"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nie można odszyfrować podpisu CRL"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Nie można odkodować klucza publicznego wystawcy"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Błąd podpisu certyfikatu"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Błąd podpisu CRL"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Certyfikat nie jest prawidłowy"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Certyfikat wygasł"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL nie jest prawidłowy"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL wygasł"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Błąd w polu notBefore certyfikatu"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Błąd w polu notAfter certyfikatu"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Błąd w polu lastUpdate CRL"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Błąd w polu nextUpdate CRL"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Certyfikat podpisany przez wystawcę"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "W łańcuchu certyfikatów znaleziono certyfikat podpisany przez wystawcę"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Nie można pobrać lokalnego certyfikatu wystawcy"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Nie można zweryfikować pierwszego certyfikatu"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Za długi łańcuch certyfikatów"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Niepoprawny certyfikat CA"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Stała długości ścieżki przekroczona"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Nieznany cel certyfikatu"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certyfikat niezaufany"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certyfikat odrzucony"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Niezgodność subject/issuer"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Tym kluczem nie można podpisywać certyfikatu"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Błąd weryfikacji aplikacji"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Połącz ponownie ręcznie."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Serwer %(name)s udzielił nieprawidłowej odpowiedzi na żądanie rejestracji: "
 "%(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serwer %s przesłał niezgodny formularz rejestracyjny"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serwer odpowiedział: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Połączenie z serwerem proxy nie powiodło się"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie można połączyć się %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Połączenie z kontem %s zostało zerwane."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Nie można potwierdzić autentyczności certyfikatu %s."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6414,7 +6690,7 @@ msgstr ""
 "\n"
 "Błąd SSL: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6423,38 +6699,38 @@ msgstr ""
 "\n"
 "Nieznany błąd SSL: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Nie można potwierdzić autentyczności certyfikatu %s."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Wysłany kontakt: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Wyślij kontakty:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
 
@@ -7338,162 +7614,186 @@ msgstr "wejście wideo"
 msgid "video output"
 msgstr "wyjście wideo"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Serwer winien mieć od 1 do 1023 znaków"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Nazwa użytkownika winna mieć od 1 do 1023 znaków"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Zasób winien mieć od 1 do 1023 znaków"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "?user status:_Dostępny"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?contact ma status: Nieznany"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?contact ma status: Wystąpiły błędy"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Posiadane autoryzacje: Brak"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Do"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Obustronna"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Poproś (o autoryzację): Brak"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Funkcja kontaktu w pokoju: Brak"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Goście"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Gość"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "pisze wiadomość..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7501,22 +7801,22 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " z pokoju %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " od użytkownika %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " od %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7524,74 +7824,74 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "Cześć, jestem $name."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Przekroczono czas ładowania obrazu"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Obraz jest za duży"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL nie jest prawidłowy"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Przekroczono czas ładowania obrazu"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informacje rejestracyjne transportu %s nie dotarły na czas"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "wiadomość"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
@@ -7630,43 +7930,43 @@ msgstr ""
 "Nie znaleziono interfejsu DBus.\n"
 "Zapoznaj się z uwagami na stronie http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi lub Bonjour"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Nie można uruchomić usługi lokalnej"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie można podłączyć się do portu %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Proszę sprawdzić czy uruchomiony jest demon Avahi."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie można zmienić statusu konta \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Twoja wiadomość nie mogła zostać wysłana."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt jest rozłączony. Twoja wiadomość nie mogła zostać wysłana."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7912,6 +8212,11 @@ msgstr "Za_banuj"
 msgid "_Add to Roster"
 msgstr "Dod_aj do listy kontaktów"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Wykonaj komendę"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8192,11 +8497,11 @@ msgstr "Informacje"
 msgid "Con_tinue"
 msgstr "_Kontynuuj"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Zatrzymaj"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Anuluj"
@@ -8205,31 +8510,31 @@ msgstr "_Anuluj"
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający ten plik"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Przesyłane pliki"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "lista przesyłanych plików"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Lista aktywnych, ukończonych i zatrzymanych transferów plików"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Wyczy_ść"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Usuwa zakończone, przerwane i nieudane transfery plików z listy"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Usuń przesyłanie tego pliku z listy."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8237,32 +8542,37 @@ msgstr ""
 "To działanie spowoduje usunięcie przesyłu pliku z listy. Jeśli jest on "
 "aktywnyto najpierw zostanie zatrzymany a dopiero potem usunięty"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Usuwa wybrany transfer pliku i usuwa niedokończony plik"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Usuwa transfer pliku"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Usuwa wybrany transfer pliku"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Wyślij i zamknij"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Ukrywa okno"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Wyświetla listę przesłanych plików"
 
@@ -8271,7 +8581,7 @@ msgid "Register to"
 msgstr "Zarejestruj w"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8302,21 +8612,21 @@ msgstr "Czcionka:"
 msgid "Clear formatting"
 msgstr "Usuń formatowanie"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Kliknij by wyświetlić listę emotikon (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Wybierz plik do wysłania..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Kliknij by wyświetlić listę emotikon (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Typ zdarzenia"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Opis zdarzenia"
@@ -8379,7 +8689,7 @@ msgstr "<b>Czcionka</b>"
 msgid "<b>#</b>"
 msgstr "<b>Czcionka</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "Nr"
 
@@ -9128,10 +9438,6 @@ msgstr "_Otwórz..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Edytor zaawansowanych konfiguracji</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Zaawansowane"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Rozpocznij _rozmowę"
@@ -9373,7 +9679,7 @@ msgid "_Open Email Composer"
 msgstr "_Otwórz Klienta Poczty"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Rozpocznij rozmowę"
 
@@ -9418,6 +9724,10 @@ msgstr "Ustawienia"
 msgid "Default:"
 msgstr "Domyślny"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Dodaj nowy kontakt"
@@ -9443,6 +9753,16 @@ msgstr "_Pseudonim:"
 msgid "_Group:"
 msgstr "_Grupa:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID uzytkownika:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Pseudonim"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9481,6 +9801,11 @@ msgstr ""
 "aby dodać kontakt posługujący się\n"
 "tym protokołem."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Zmień opis statusu"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Nastrój</b>"
@@ -9699,10 +10024,9 @@ msgstr "_Wykonaj komendę"
 msgid "_Verify"
 msgstr "_Weryfikuj"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Konta"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Opis</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9729,11 +10053,6 @@ msgstr "Pokaż kontakty _połączone"
 msgid "Show Transports"
 msgstr "Pokaż trans_porty"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Przesyłane pliki"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9807,35 +10126,25 @@ msgstr "Minimalizuj po automatycznym wejściu"
 msgid "Pr_int status:"
 msgstr "Wyświetlaj status:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Opis"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Zgłoś Błąd"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Nie jest prawdopodnie krytyczny, ale powinien zostać mimo to zgłoszony "
 "deweloperom."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Prośba o autoryzację"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Zgłoś Błąd"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "O_dmów"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9843,16 +10152,11 @@ msgstr ""
 "Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś "
 "połączony"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Działania"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Autoryzuj"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autoryzuj kontakt - będzie wówczas wiedział, kiedy jesteś połączony"
 
@@ -9870,11 +10174,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Obecność"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Zaproś przyjaciół!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9883,15 +10187,20 @@ msgstr ""
 "Zamierzasz rozpocząć czat.\n"
 "Wybierz kontakty, które chcesz do niego zaprosić"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Proszę wybrać serwer MUC."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Serwer MUC"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Zaproś"
 
@@ -10012,11 +10321,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Sprzątam"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10179,6 +10483,16 @@ msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 msgid "Mute Sounds"
 msgstr "Wyłącz dźwięki"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Ustawienia"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Zakończ"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Do:"
@@ -10590,14 +10904,6 @@ msgstr "Nadpisać?"
 msgid "Configuration"
 msgstr "Konfiguracja pokoju"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Klient komunikatora Jabber"
@@ -10723,6 +11029,32 @@ msgid "Plugin manager"
 msgstr "Rejestracja nie powiodła się"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "Konto XMPP %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Opis"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>%(jid)s</b> chciałby <b>%(action)s</b> kilka kontaktów w Twoim "
+#~ "rosterze."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów "
+#~ "połączeń. Może zawierać tls, ssl lub plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Działania"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Wymaga python-dbus"
 
@@ -10925,12 +11257,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Użycie: /%s ukrywa przyciski czatu."
 
-#~ msgid "File is empty"
-#~ msgstr "Plik jest pusty"
-
-#~ msgid "File does not exist"
-#~ msgstr "Plik nie istnieje."
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10959,56 +11285,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "Wymaga python-pyopenssl"
 
-#~ msgid "?user status:_Available"
-#~ msgstr "?user status:_Dostępny"
-
-#~ msgid "?user status:Available"
-#~ msgstr "?user status:Dostępny"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?contact ma status: Nieznany"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?contact ma status: Wystąpiły błędy"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Posiadane autoryzacje: Brak"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Poproś (o autoryzację): Brak"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Funkcja kontaktu w pokoju: Brak"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Powiązanie kontaktu z czata: brak"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Wszystkie"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Żaden"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Dostępny"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "konto"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "wiadomość"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "priorytet"
-
 #~ msgid "?CLI:uri"
 #~ msgstr "?CLI:uri"
 
@@ -11024,30 +11300,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "?CLI:password"
 #~ msgstr "hasło"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Czaty"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Pobieranie"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Prześlij"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?status transferu:wstrzymany"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Klient: Nieznany"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?System operacyjny: Nieznany"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Czas: Nieznany"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Korzystaj z DBus i Demona Powiadomień aby wyświetlać powiadomienia"
 
@@ -11262,9 +11514,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Choose _Key..."
 #~ msgstr "Wybierz _klucz..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Użyj Agenta G_PG"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11391,18 +11640,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Wejście XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtr:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Wejście XML</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Wyślij"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Kosola XML dla %s"
 
@@ -11858,9 +12095,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "9"
 #~ msgstr "9"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Opis</b>"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Wpisz JID lub nazwę kontaktu"
 
@@ -11895,14 +12129,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "Please check if avahi/bonjour-daemon is running."
 #~ msgstr "Proszę sprawdzić czy uruchomiony jest demon Avahi."
 
-#, fuzzy
-#~ msgid ""
-#~ "<b>Message was corrected. Last message was:</b>\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "<b>Poprawna wiadomość. Ostatnia:</b>\n"
-#~ "  %s"
-
 #~ msgid "%s is not the name of a group chat."
 #~ msgstr "%s nie jest nazwą czatu."
 
@@ -12814,9 +13040,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "Baza kluczy GNOME"
 
@@ -12862,14 +13085,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ "Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w "
 #~ "trzeciej osobie (np. /%s eksploduje.)"
 
-#, fuzzy
-#~ msgid "Encryption enabled"
-#~ msgstr "Szyfrowanie E2E włączone"
-
-#, fuzzy
-#~ msgid "Encryption disabled"
-#~ msgstr "Szyfrowanie E2E wyłączone"
-
 #~ msgid ""
 #~ "If checked, Gajim will sort contacts in roster window and groupchats by "
 #~ "their status and not by the shown name"
diff --git a/po/pt.po b/po/pt.po
index ba49ef733..76e2d63aa 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -25,20 +25,20 @@ msgstr ""
 msgid "Error."
 msgstr "Erro:"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -84,72 +84,72 @@ msgstr "Tempo"
 msgid "Progress"
 msgstr "Progresso"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Você"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado em: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Transferência de ficheiro completa"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Abrir Pasta"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Transferência de ficheiro cancelada"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Ligação ao peer não pode ser estabelecida."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Destinatário: "
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -157,128 +157,128 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Escolher Ficheiro para Enviar"
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "E_nviar"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 #, fuzzy
 msgid "Description: "
 msgstr "Descrição: %s"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim não consegue aceder a este ficheiro"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Enviar _Ficheiro"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Ficheiro Inválido"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Nome: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pausa"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -438,45 +438,67 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr ""
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Disponível"
+
 #: gajim/features_window.py:101
 #, fuzzy
 msgid "Feature"
 msgstr "Recursos dos Servidores"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Erro na interpretação (parsing) do ficheiro:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Guardado em: %s"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Cliente:Desconhecido"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?SO:Desconhecido"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Cliente:Desconhecido"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplicações</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -485,7 +507,7 @@ msgstr ""
 "Este contacto está interessado/a na suas informações de presença, mas você "
 "não está interessado na dele/a"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -494,13 +516,13 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Você e o contacto estão interessados nas informações de presença um do outro"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -508,27 +530,37 @@ msgid ""
 msgstr ""
 "Você e o contacto estão interessados nas informações de presença um do outro"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Está à espera da resposta do contacto sobre o seu pedido de subscrição"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Todos os ficheiros"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Evento"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Gerir Perfis de Proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -574,13 +606,13 @@ msgid "_New Group Chat"
 msgstr "Chat"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
@@ -593,7 +625,7 @@ msgstr "Eu gostaria de o adicionar à minha lista"
 msgid "Send Single _Message…"
 msgstr "Enviar _Mensagem Simples"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 #, fuzzy
 msgid "Send Cus_tom Status"
@@ -614,25 +646,25 @@ msgstr "Transportes"
 msgid "_Modify Transport"
 msgstr "Transportes"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Renomear"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 #, fuzzy
 msgid "Remo_ve"
@@ -648,214 +680,234 @@ msgstr "Informações do Contacto"
 msgid "Send File..."
 msgstr "Enviar _Ficheiro"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Contacto:"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Adicionar à Lista"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Informações do Contacto"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Histórico"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Gerir Bookmarks"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Muda A_ssunto"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Configurar _Sala"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Descrição: %s"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Muda Alcu_nha"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "mensagem de estado:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 msgid "Minimize on close"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "comando"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Contacto Entrou"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Adicionar Contacto"
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "Ficheiro"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Descobrir Recursos"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Enviar _Mensagem Simples"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avançado"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferências"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Mostrar Contactos _Offline"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Admin"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "E_nviar Mensagem de Servidor"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Definir MOTD"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Actualizar MOTD"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Apagar MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Nenhuma conta disponível"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Contas"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "mensagem"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Gerir Emoticons"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "a criar base de dados dos logs"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Data:"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 #, fuzzy
 msgid "Nickname"
 msgstr "Alcunha:"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mensagem"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 #, fuzzy
 msgid "Subject"
 msgstr "Assunto:"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -864,99 +916,99 @@ msgid ""
 "In case you click YES, please wait…"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr ""
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "O serviço não pôde ser encontrado"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Informações do Contacto"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 msgid "Retrieving profile…"
 msgstr ""
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr ""
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informações do Contacto"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 #, fuzzy
 msgid "Information received"
 msgstr "Convite Recebido"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "É necessária uma ligação para poder publicar as suas informações de contacto."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Enviar Ficheiro"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr ""
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -974,10 +1026,10 @@ msgstr "Nome do Contacto <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Geral"
@@ -1071,39 +1123,39 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "erro ao enviar"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1111,56 +1163,56 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Cliente Jabber GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, python-format
 msgid "GTK+ Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, python-format
 msgid "PyGObject Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 msgid "Current Developers"
 msgstr ""
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 msgid "Past Developers"
 msgstr ""
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Uma ligação não está disponível"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1169,13 +1221,13 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Ligação"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1184,513 +1236,536 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Alcunha não encontrada: %s"
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Pedido de Subscrição"
+
+#: gajim/dialogs.py:2284
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Pedido de subscrição para a conta %s por parte de %s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Entrar num Chat"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Entrada inválida"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 msgid "Please choose a nickname"
 msgstr ""
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Frase de acesso"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nome"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Servidor"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr ""
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Ligação"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Chat"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Adicionar Novo Contacto"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nova Mensagem"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "De %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Evento"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtro:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Entrada XML</b>"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Enviar"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Interrompida"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "_Modificar"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Remover"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 #, fuzzy
 msgid "Add"
 msgstr "Endereço"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 #, fuzzy
 msgid "Delete"
 msgstr "Apagar MOTD"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Adicionar _Contacto"
 msgstr[1] "Adicionar _Contacto"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Remove o contacto da lista"
 msgstr[1] "Remove o contacto da lista"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Preferências"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr ""
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Erro:"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr ""
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Descrição: %s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está banido/a desta sala."
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Imagens"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Escolha chave"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Todos os ficheiros"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "para conta %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1714,336 +1789,373 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr ""
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Transferências de Ficheiros"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Encriptação desactivada"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s agora é conhecido como %s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Já não se encontra na sala \"%s\" ou \"%s\" saiu."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr ""
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Jabber ID Inválido"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Esta sala não tem assunto"
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrição: %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar autenticação"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar autenticação"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 #, fuzzy
 msgid "Conversation with "
 msgstr "Histórico das Conversas"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Ligação"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Filiação: "
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr ""
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se fechar esta janela, perder-se-á a ligação a esta sala."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Transferências de Ficheiros"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Transferências de Ficheiros"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr ""
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2051,7 +2163,7 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2060,106 +2172,106 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Tamanho: "
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceitar"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Entrar"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Remove o contacto da lista"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro na leitura do ficheiro:"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 #, fuzzy
 msgid "Groupchats"
 msgstr "Chat"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorização foi enviada"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar este pedido, você passará a saber o seu estado."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorização foi removida"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2167,11 +2279,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2179,39 +2291,39 @@ msgstr ""
 "Mudar o seu estado para invisível fará com que seja desligado desses chats. "
 "De certeza que deseja tornar-se invisível?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Tem a certeza de que deseja sair das salas \"%s\"?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr ""
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar transferência de ficheiro"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -2219,16 +2331,16 @@ msgid ""
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -2237,12 +2349,12 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2251,71 +2363,71 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Renomear"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Remover"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove o contacto da lista"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2324,12 +2436,12 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2338,16 +2450,16 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto saiba o meu estado depois da remoção"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2356,252 +2468,252 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Não pode entrar numa sala quando está invisível"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ficheiro Inválido"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s quer enviar-lhe um ficheiro:"
 msgstr[1] "%s quer enviar-lhe um ficheiro:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "_Publicar"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "_Descobrir Recursos..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr ""
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Nova Mensagem"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr ""
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilizadores _Online"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr ""
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Contacto:"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar _Grupos"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Remover"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr ""
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto Entrou"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto Entrou"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Entrar num Chat"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Mudar Mensagem de Estado"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Mostrar apenas na _lista"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor de Configuração Avançada"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuração da Sala"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ligando"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Gajim - %d mensagem não lida"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2610,7 +2722,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2618,7 +2730,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2760,16 +2872,16 @@ msgstr "Encriptação desactivada"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Guardar senha"
 
@@ -2800,10 +2912,20 @@ msgstr "Remover conta _apenas do Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+#, fuzzy
+msgid "?print_status:All"
+msgstr "Mostrar hora:"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr ""
 
+#: gajim/config.py:1949
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Mostrar hora:"
+
 #: gajim/config.py:2015
 #, fuzzy
 msgid "New Group Chat"
@@ -2875,12 +2997,12 @@ msgstr "Entrada inválida"
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contacto já se encontra na lista"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2982,95 +3104,120 @@ msgstr ""
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 #, fuzzy
 msgid "Owner"
 msgstr "_Dono"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr ""
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 #, fuzzy
 msgid "Connected"
 msgstr "Ligação"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto Entrou"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Download"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Upload"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Tipo: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Parada"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Completa"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+#, fuzzy
+msgid "?transfer status:Paused"
+msgstr "Mostrar hora:"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "A transferir"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Estado: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "Mostrar hora:"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Ausente"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Indisponível"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Offline"
 
@@ -3122,127 +3269,131 @@ msgstr "(Nenhum)"
 msgid "Hidden"
 msgstr "Escondida"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversas com %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Histórico das Conversas"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 #, fuzzy
 msgid "Disk Error"
 msgstr "Erro:"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 #, fuzzy
 msgid "Error"
 msgstr "Erro:"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Mudar Mensagem de Estado"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Gerir Bookmarks"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Fora da lista"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Mostrar _Lista de Contactos"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Impossível entrar na sala"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr ""
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr ""
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Nome do Host:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Recursos dos Servidores"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Guardado em: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3405,7 +3556,7 @@ msgstr "_Subscrever"
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -3414,52 +3565,58 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde que prestou atenção a este "
 "chat pela última vez."
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "_Sair"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta um \"%s\" no URL do Dicionário e como tal não é WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr ""
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Jabber ID Inválido"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3471,35 +3628,40 @@ msgstr[1] "Ontem"
 msgid "Write a message.."
 msgstr "Nova Mensagem Privada"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Não está ligado ao servidor"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Chat"
+
+#: gajim/message_window.py:545
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossível entrar na sala"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3510,276 +3672,281 @@ msgstr ""
 "A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
 "Por favor, introduza outra alcunha em baixo:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Aceita este pedido?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%s) Autorização para %s (id: %s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "É necessária uma palavra-passe para esta sala."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Registos</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Está banido/a desta sala."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Tal sala não existe."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Tal sala não existe."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Criação de salas encontra-se restrita."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Impossível entrar na sala"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "A sua alcunha registada tem de ser usada."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Não está na lista de membros."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Introduza a sua mensagem :"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 #, fuzzy
 msgid "Subscription request"
 msgstr "Pedido de Subscrição"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Subscrever"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Frase de acesso"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Frase de acesso"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr ""
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Enviou com sucesso %(filename)s para %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Escolher Ficheiro para Enviar"
+
+#: gajim/gui_interface.py:1196
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Em todas as _mensagens"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Recurso: "
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3787,7 +3954,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3797,15 +3964,15 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3820,46 +3987,46 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Encriptação desactivada"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr ""
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3867,43 +4034,43 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 #, fuzzy
 msgid "default"
 msgstr "Apagar MOTD"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Encriptação OpenPGP"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "O utilizador será ligado a %s sem OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 
@@ -3974,6 +4141,11 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4005,7 +4177,7 @@ msgstr "Entrada inválida"
 msgid "The form is not filled correctly."
 msgstr "O formulário não foi preenchido correctamente"
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -4134,6 +4306,53 @@ msgid ""
 "Link-local messaging might not work properly."
 msgstr ""
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+msgid "Could not request upload slot"
+msgstr ""
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+msgid "Could not open file"
+msgstr ""
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+msgid "Server returned unsecure transport (http)"
+msgstr ""
+
+#: gajim/dialog_messages.py:162
+msgid "Could not upload file"
+msgstr ""
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Encriptação activada"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Uma ligação não está disponível"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4159,7 +4378,16 @@ msgstr "Não pode apagar o seu tema actual"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Contas fundidas"
+
+#: gajim/accounts_window.py:41
+msgid "Use PGP Agent"
+msgstr ""
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr ""
 
@@ -4180,6 +4408,11 @@ msgstr "Não tem nenhuma conta activa"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Remover"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4375,53 +4608,67 @@ msgstr "Mudar Senha"
 msgid "Login Options"
 msgstr "Gerir Emoticons"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus não está presente nesta máquina, ou falta módulo python"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "Exibe ajuda acerca de um comando específico"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "comando"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "mostrar ajuda sobre comando"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Abre uma janela com a próxima mensagem não lida"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Mostra uma lista de todos os contactos na lista. Cada contacto aparece numa "
 "linha separada"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "conta"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "mostrar apenas contactos da conta indicada"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Mostra uma lista de contas registadas"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "estado"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4430,11 +4677,17 @@ msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mensagem"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "mensagem de estado:"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4443,17 +4696,22 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "_Prioridade"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quero _registar uma nova conta"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4463,7 +4721,7 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4474,29 +4732,29 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "conteúdo da mensagem"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se especificado, a mensagem será encriptada usando esta chave pública"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4506,112 +4764,112 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 #, fuzzy
 msgid "subject"
 msgstr "Assunto:"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "Ficheiro"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "chave=valor"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'chave' é o nome da preferência, 'valor' é o valor da qual se pretende "
 "definir"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "chave"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escreve o estado actual das preferências do Gajim para o ficheiro .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Remove o contacto da lista"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se especificado, o contacto é escolhido da lista de contactos desta conta"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -4619,56 +4877,56 @@ msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr ""
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 #, fuzzy
 msgid "XML to send"
 msgstr "Consola XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Contacto Saiu"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Alcunha não encontrada: %s"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4677,31 +4935,31 @@ msgstr ""
 "'%s' não está na sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem"
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4712,7 +4970,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4721,7 +4979,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4906,11 +5164,6 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "para conta %s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, fuzzy, python-format
 msgid ""
@@ -4936,52 +5189,52 @@ msgstr "Autorização foi removida"
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Única de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Mensagem Privada da conversa de grupo %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, fuzzy, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Mudou de Estado"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Iniciou Sessão"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Terminou Sessão"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 #, fuzzy
 msgid "Not in roster"
 msgstr "Fora da lista"
@@ -5712,256 +5965,264 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "Permitir que o Gajim envie a sua hora local."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Usar autenticação"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Usar autenticação"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Usar autenticação"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "A trabalhar"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefone"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Estou fora"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr ""
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr ""
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -5970,27 +6231,27 @@ msgstr ""
 "Som a tocar quando uma mensagem de chat conter uma das palavras da lista "
 "muc_highlight_words, or quando uma mensagem conter a sua alcunha."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "human"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Para"
@@ -6077,37 +6338,52 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr "Gajim - %d mensagem não lida"
 
+#: gajim/common/httpupload.py:137
+#, fuzzy
+msgid "File is empty"
+msgstr "Localização do ficheiro"
+
+#: gajim/common/httpupload.py:140
+#, fuzzy
+msgid "File does not exist"
+msgstr "Tal sala não existe."
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "a criar base de dados dos logs"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "a criar base de dados dos logs"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Enviar %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é um ficheiro, mas deveria ser um directório"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim irá agora sair"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é um directório, mas deveria ser um ficheiro"
@@ -6117,11 +6393,11 @@ msgstr "%s é um directório, mas deveria ser um ficheiro"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "a criar base de dados dos logs"
@@ -6131,237 +6407,237 @@ msgstr "a criar base de dados dos logs"
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossível entrar na sala"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr ""
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr ""
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr ""
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr ""
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr ""
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Nome de utilizador inválido"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr ""
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr ""
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr ""
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Guardado em: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Ligação"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossível ligar a \"%s\""
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se o seu login e senha estão correctos."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr ""
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contacto:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -7295,254 +7571,279 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Caractere inválido no hostname."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Endereço de servidor necessário."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Caractere inválido no nome de utilizador"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "_Disponível"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Ligando"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "A_usente"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Offline"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Desconhecido"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Contém erros"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Nenhuma"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Para"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Nenhum"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está a escrever uma mensagem..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensagem pendente"
 msgstr[1] "%d mensagens pendentes"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr "De %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr ""
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr ""
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Erro na leitura do ficheiro:"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informação de registo para o transport %s não chegou a tempo"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "mensagem"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
@@ -7574,44 +7875,44 @@ msgid ""
 "Try reading %(url)s"
 msgstr "Bus da sessão não está disponível."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível entrar na sala"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7863,6 +8164,11 @@ msgstr "_Banir"
 msgid "_Add to Roster"
 msgstr "_Adicionar à Lista"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "comando"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8174,11 +8480,11 @@ msgstr "Sobre"
 msgid "Con_tinue"
 msgstr "_Continuar"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -8187,33 +8493,33 @@ msgstr "_Cancelar"
 msgid "_Open Containing Folder"
 msgstr "_Abrir Pasta"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Transferências de Ficheiros"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "lista de transferências de ficheiros"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Limpar"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Remove transferências de ficheiros completas, canceladas e falhadas da lista"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Remover a transferência de ficheiro da lista."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8221,36 +8527,41 @@ msgstr ""
 "Esta acção remove uma única transferência de ficheiro da lista. Se a "
 "transferência estiver activa, será primeiro interrompida e depois removida."
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Cancela a transferência de ficheiro seleccionada e remove o ficheiro "
 "incompleto"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Cancelar transferência de ficheiro"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Cancela a transferência de ficheiro seleccionada"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "E_nviar & Fechar"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Esconde a janela"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Quando uma transferência de ficheiro é concluida, exibir um popup de "
 "notificação"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 #, fuzzy
 msgid "Shows a list of file transfers between you and others"
 msgstr ""
@@ -8261,7 +8572,7 @@ msgid "Register to"
 msgstr "Registar para"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8295,22 +8606,22 @@ msgstr "Letra:"
 msgid "Clear formatting"
 msgstr "Informações do Contacto"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Clique para inserir um emoticon (Alt+E)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Escolher Ficheiro para Enviar"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+#, fuzzy
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Clique para inserir um emoticon (Alt+E)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Evento"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Eventos"
@@ -8373,7 +8684,7 @@ msgstr "<b>Registos</b>"
 msgid "<b>#</b>"
 msgstr "<b>Registos</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr ""
 
@@ -9153,10 +9464,6 @@ msgstr "Abrir..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor de Configuração Avançada</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avançado"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Iniciar _Conversa"
@@ -9418,7 +9725,7 @@ msgid "_Open Email Composer"
 msgstr "_Abrir Compositor de Email"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
 
@@ -9466,6 +9773,10 @@ msgstr "Preferências"
 msgid "Default:"
 msgstr "Apagar MOTD"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Adicionar Novo Contacto"
@@ -9495,6 +9806,16 @@ msgstr "_Alcunha:"
 msgid "_Group:"
 msgstr "Grupo:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID do Utilizador:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Alcunha:"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9528,6 +9849,11 @@ msgid ""
 "to add a contact from this protocol."
 msgstr ""
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Mudar Mensagem de Estado"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 #, fuzzy
 msgid "<b>Mood:</b>"
@@ -9769,10 +10095,10 @@ msgstr "comando"
 msgid "_Verify"
 msgstr ""
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Contas"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Descrição</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9799,11 +10125,6 @@ msgstr "Mostrar Contactos _Offline"
 msgid "Show Transports"
 msgstr "Transportes"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Transferências de Ficheiros"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9877,35 +10198,26 @@ msgstr ""
 msgid "Pr_int status:"
 msgstr "Mostrar hora:"
 
-#: gajim/data/gui/exception_dialog.ui:7
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Exception"
-msgstr "Descrição"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Reportar Erro (Bug)"
-
-#: gajim/data/gui/exception_dialog.ui:89
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Foi detectado um erro de programação.\n"
 "Provavelmente não é fatal, mesmo assim deverá ser comunicado\n"
 " aos programadores"
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Pedido de Subscrição"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Reportar Erro (Bug)"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Negar"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
@@ -9914,17 +10226,12 @@ msgstr ""
 "Recusar autorização do contacto, para que ele não possa saber quando você "
 "está ligado"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Acções"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 #, fuzzy
 msgid "Au_thorize"
 msgstr "_Autorizar"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 #, fuzzy
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autorize o contacto para ele saber quando você está ligado"
@@ -9943,11 +10250,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Presença"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
@@ -9955,16 +10262,21 @@ msgstr ""
 "Está neste momento a entrar numa conversa de grupo.\n"
 "Seleccione os contactos que quer convidar"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr ""
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 #, fuzzy
 msgid "MUC server"
 msgstr "Servidor"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 #, fuzzy
 msgid "In_vite"
 msgstr "Invisível"
@@ -10076,11 +10388,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Evento"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10249,6 +10556,16 @@ msgstr "Mostrar Todos os _Eventos Pedentes"
 msgid "Mute Sounds"
 msgstr "Sons Wav"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferências"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Sair"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Para:"
@@ -10647,14 +10964,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configuração da Sala"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
@@ -10779,6 +11088,23 @@ msgid "Plugin manager"
 msgstr "Publicação vCard falhou"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "para conta %s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Descrição"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "Gostaria de o adicionar à minha lista de contactos."
+
+#~ msgid "_Actions"
+#~ msgstr "_Acções"
+
+#, fuzzy
 #~ msgid "Start Chat..."
 #~ msgstr "_Iniciar Conversa"
 
@@ -10945,14 +11271,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Ocultar os botões da conversa"
 
-#, fuzzy
-#~ msgid "File is empty"
-#~ msgstr "Localização do ficheiro"
-
-#, fuzzy
-#~ msgid "File does not exist"
-#~ msgstr "Tal sala não existe."
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10962,61 +11280,6 @@ msgstr "Publicação vCard falhou"
 #~ "tempo."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "_Disponível"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "Mostrar hora:"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Desconhecido"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Contém erros"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Nenhuma"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Nenhum"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Função do Contacto no Chat:Nenhuma"
-
-#, fuzzy
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Função do Contacto no Chat:Nenhuma"
-
-#, fuzzy
-#~ msgid "?print_status:All"
-#~ msgstr "Mostrar hora:"
-
-#, fuzzy
-#~ msgid "?print_status:None"
-#~ msgstr "Mostrar hora:"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Disponível"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "conta"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "estado"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "mensagem"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "_Prioridade"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "De"
 
@@ -11029,28 +11292,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "Senha:"
 
 #, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Chat"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Download"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Upload"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Cliente:Desconhecido"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?SO:Desconhecido"
-
-#, fuzzy
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Cliente:Desconhecido"
-
-#, fuzzy
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
 
@@ -11318,17 +11559,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Entrada XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtro:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Entrada XML</b>"
-
-#~ msgid "Send"
-#~ msgstr "Enviar"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Consola XML para %s"
 
@@ -11554,10 +11784,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "está a prestar atenção à conversa"
 
 #, fuzzy
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>Descrição</b>"
-
-#, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Nome do Contacto"
 
@@ -12126,10 +12352,6 @@ msgstr "Publicação vCard falhou"
 #~ msgstr "Este contacto já se encontra na sua lista de contactos."
 
 #, fuzzy
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP: "
-
-#, fuzzy
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Transferência de ficheiro parada pelo contacto na outra ponta"
 
@@ -12158,12 +12380,6 @@ msgstr "Publicação vCard falhou"
 #~ "Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
 #~ "pessoa. (Por exemplo, /%s explode.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Encriptação activada"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Encriptação desactivada"
-
 #~ msgid "<b>Please fill in the data for your new account</b>"
 #~ msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 37d3419ab..3900dc75a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-12-31 23:22-0300\n"
 "Last-Translator: Djavan Fagundes <dnoway@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
@@ -31,20 +31,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Erro."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Realmente enviar o arquivo?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Se você enviar um arquivo para %s, ele(a) saberá o seu Jabber ID real."
@@ -100,70 +100,70 @@ msgstr "Tempo"
 msgid "Progress"
 msgstr "Progresso"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Você"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Salvo em: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Abrir pasta do arquivo"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivos cancelada"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Conexão com o par não pode ser estabelecida."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Conteúdo: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensagem de erro: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Transferência do arquivo parada"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -171,34 +171,34 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Escolha o arquivo para enviar..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Enviar"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Descrição: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Não é possível sobrescrever o arquivo \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -206,93 +206,93 @@ msgstr ""
 "Um arquivo com este nome já existe e você não tem permissão para sobrescrevê-"
 "lo."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "O diretório \"%s\" não é gravável"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Você não tem permissão para criar este diretório."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Salvar arquivo como..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Arquivo: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Enviando perfil..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Erro na transferência de arquivos"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Arquivo inválido"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Arquivo: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar arquivos vazios"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Nome: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pausa"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -455,45 +455,66 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Requer python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Disponível"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Recurso"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Erro ao analisar o arquivo:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Extensão não suportada"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "A imagem não pode ser salva no formato %(type)s. Salvar como "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Salvar imagem como..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Possui "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Cliente:Desconhecido"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?SO:Desconhecido"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Tempo:Desconhecido"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliação:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -502,7 +523,7 @@ msgstr ""
 "Este contato está interessado em sua informação de presença, mas você não "
 "está interessado na presença dele/dela"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -511,13 +532,13 @@ msgstr ""
 "Você está interessado na informação da presença do contato, mas ele/ela não "
 "está interessado na sua"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Você e o contato estão interessados na informação da presença de cada um"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -525,28 +546,38 @@ msgid ""
 msgstr ""
 "Você e o contato estão interessados na informação da presença de cada um"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Você está esperando a resposta do contato sobre seu pedido de inscrição"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Não há requisições de inscrições pendentes."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Todos os arquivos"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Limpando"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Gerenciar perfis de proxy"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -589,13 +620,13 @@ msgid "_New Group Chat"
 msgstr "_Nova conferência"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
@@ -608,7 +639,7 @@ msgstr "Eu gostaria de adiciona-lo à minha lista"
 msgid "Send Single _Message…"
 msgstr "Enviar _mensagem simples"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Enviar status perso_nalizado"
@@ -626,25 +657,25 @@ msgstr "_Gerenciar transporte"
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Renomear"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Desbloquear"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Remo_ver"
@@ -658,205 +689,225 @@ msgstr "_Informações"
 msgid "Send File..."
 msgstr "Enviar _arquivo..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Convidar _contatos"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Adicionar à lista"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "Áudio / Vídeo"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "Alternar sessão de vídeo"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Informações"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Histórico"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Gerenciar sala"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Alterar as_sunto..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Configurar _sala..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Excluir sala"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Alterar _apelido..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Adicionar esta sala aos marcadores"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Voz"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Modelos de mensagens"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimizar ao fechar"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Executar comando"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Desconectar"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Adicionar contato..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "arquivo"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Descubra serviços"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "_Enviar mensagem simples..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avançado"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Preferências"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sincronizar"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Listas de privacidade"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Servidor"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Console XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Administração"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Enviar mensagem de servidor..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Definir MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Atualizar MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Excluir MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Conta não disponível"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Contas"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "mensagem"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Emoticons:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Data:"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Apelido"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mensagem"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Assunto"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -864,7 +915,7 @@ msgstr ""
 "Você quer limpar o banco de dados? (ALTAMENTE NÃO RECOMENDADO COM O GAJIM EM "
 "EXECUÇÃO)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -879,99 +930,99 @@ msgstr ""
 "\n"
 "Se caso você clicou SIM, por favor espere... "
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Erro na base de dados"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Exportando histórico de logs..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s em %(time)s disse: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Você realmente quer excluir a mensagem selecionada?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Você realmente quer excluir os logs do contato selecionado?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "O serviço não pode ser encontrado"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Cancelar confirmação"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Você realmente quer excluir a mensagem selecionada?"
 msgstr[1] "Você realmente quer excluir as mensagens selecionadas?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Esta é uma operação irreversível."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Recuperando perfil..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informações do contato"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formato: YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informação recebida"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Você deve estar conectado para publicar suas informações de contato."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Enviando perfil..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informação NÃO publicada"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -988,10 +1039,10 @@ msgstr "Nome do contato: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Geral"
@@ -1081,36 +1132,36 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Você não pode adicionar você mesmo na sua lista."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à lista"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ID do usuário:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Erro ao adicionar serviço. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1118,50 +1169,50 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Um cliente Jabber GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Versão do GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Versão do PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Desenvolvedores atuais:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Desenvolvedores passados:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "Nós gostaríamos de agradecer todos os mantedores do pacote."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br>\n"
@@ -1169,12 +1220,12 @@ msgstr ""
 "Djavan Fagundes <djavan@comum.org>\n"
 "Og Maciel <og.maciel@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "O dicionário para o idioma %s não está disponível"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1187,12 +1238,12 @@ msgstr ""
 "\n"
 "O recurso de destacar palavras grafadas incorretamente não será usado"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1203,280 +1254,304 @@ msgstr ""
 "Você está enviando sua senha em uma conexão não-segura. Você deve instalar o "
 "PyOpenSSL para prevenir isto. Você tem certeza que quer fazer isso?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sim, eu realmente quero me conectar de modo não-seguro"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Não me pergunte novamente"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "O apelido possui caracteres não permitidos."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Solicitação de inscrição"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitação de inscrição para conta %(account)s de %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Ingressar numa conferência"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Sala inválida"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Apelido inválido"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Crie um novo tema com o nome que você desejar."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "JID inválido:"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Você não pode ingressar em uma sala de conferência até que esteja conectado."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "URI incorreta"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Isto não é uma conferência"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sem uma conexão, você pode não sincronizar seus contatos."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nome"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Servidor"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Você não pode sincronizar com uma conta a menos que esteja conectado."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Conversação continuada"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Nova conferência"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Adicionar novo contato"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar conectado para mudar sua senha."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Senha inválida"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nova mensagem"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nova mensagem"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Enviar mensagem privada"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Novo e-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Solicitação de transferência de arquivos"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Erro na transferência de arquivos"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Transferência do arquivo completa"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Transferência do arquivo parada"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Convite para conferência"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "O contato alterou seu status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem simples usando conta %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem simples na conta %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Mensagem simples"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Formulário %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Não é possível enviar uma mensagem para %s, este não é um JID válido."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Limpando"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtro:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Entrada XML</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Enviar"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "adicionar"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "modificar"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "remover"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1485,202 +1560,202 @@ msgstr ""
 "<b>%(jid)s</b> gostaria que você <b>%(action)s</b> alguns contatos na sua "
 "lista."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Adicionar"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Modificar"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Deletar"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Grupos"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s me sugeriu adicionar você à minha lista."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Adicionados %s contatos"
 msgstr[1] "Adicionados %s contatos"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Removidos %s contatos"
 msgstr[1] "Removidos %s contatos"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Preferências"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "O serviço retornou um erro."
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Erro"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidade <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidade para %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Lista de privacidade"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordem: %(order)s, ação: %(action)s tipo: %(type)s, valor: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordem: %(order)s, ação: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar uma regra</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Adicionar uma regra</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista de privacidade para %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Nome de lista inválido"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Você deve digitar um nome para criar uma lista de privacidade."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Você foi convidado para uma conferência"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact convidou você para ingressar em uma discussão"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact convidou você para entrar na conferência %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Você quer aceitar este convite?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Escolher som"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Imagens"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Escolha imagem"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Todos os arquivos"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando notificação especial para %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "um áudio e vídeo"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "um áudio"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "um video"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -1689,12 +1764,12 @@ msgstr ""
 "O %(contact)s quer iniciar uma sessão  %(type)s com você. Você quer "
 "responder a chamada?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "para conta %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1718,68 +1793,96 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Erro de certificado SSL"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Transferência de arquivos"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Criptografia desabilitada"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s agora é conhecido como %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s agora está %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Você não está mais na sala da conversa \"%(room)s\" ou \"%(nick)s\" saiu."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Mudando assunto"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Mudando apelido"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique o novo apelido que você quer usar:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Jabber ID da conferência inválido:"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "O Jabber ID da conferência possui caracteres não permitidos."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Excluindo %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1788,251 +1891,261 @@ msgstr ""
 "Você está prestes a excluir definitivamente esta sala.\n"
 "Você deve especificar uma justificativa abaixo:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Você também pode entrar com um ponto de encontro alternativo:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Inserir apelido"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "e autenticada"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "e NÃO autenticada"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "Criptografia%(type)s %(status)s ativa %(authenticated)s.\n"
 "Sua conversa %(logged)s está sendo gravada."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Conversação com "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Conversação continuada"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s alterou o assunto para %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "A sala agora exibe membros indisponíveis"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "a sala agora não mostra membros indisponíveis"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "A gravação das conversas da sala está ativo agora"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "A gravação das conversas da sala está desligado agora"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Agora a sala é não-anônima"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Agora a sala é semi-anônima"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Agora a sala é totalmente anônima"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s foi removido da sala (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "A gravação das conversas da sala está ligado"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "O servidor atribuiu ou modificou o apelido da sua sala"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi chutado por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi removido da sala (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "filiação alterada"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "a configuração da sala mudou para aceitar apenas membros"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "desligamento do sistema"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** A afiliação de %(nick)s foi alterada para %(affiliation)s por %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** A afiliação de %(nick)s foi alterado para %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** O cargo de %(nick)s foi definido para %(role)s por %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** O cargo de %(nick)s foi definido para %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Você tem certeza que quer deixar a conferência \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se você fechar esta janela, será desconectado desta conferência."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Transferência de arquivos"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Transferência de arquivos"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Exibe uma lista de formatações"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Este contato não suporta transferência de arquivo."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s estado: %(state)s, razão: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da conferência %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Negociação da sessão cancelada"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "A sessão NÃO SERÁ gravada"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Esta sessão está criptografada"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " e SERÁ gravada"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " e NÃO SERÁ gravada"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2040,16 +2153,16 @@ msgstr ""
 "Identidade do contato remoto não verificada. Clique no botão de proteção "
 "para mais detalhes."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "Criptografia E2E desabilitada"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Você acabou de receber uma nova mensagem de \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2057,7 +2170,7 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2066,7 +2179,7 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2075,96 +2188,96 @@ msgstr ""
 "Não foi possível descriptografar a mensagem de %s\n"
 "Ela pode ter sido adulterada."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s agora está %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Transferência de arquivos"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Tamanho: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Aceitar"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Ingressar"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "O contato remoto parou a transferência"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Erro abrindo arquivo"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Salas"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transportes"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorização foi enviada"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o status dele ou dela."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorização foi removida"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG não é usável"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2172,11 +2285,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2184,38 +2297,38 @@ msgstr ""
 "Mudando seu status para invisível resulta na desconexão daquelas "
 "conferências. Você tem certeza que quer ir invisível?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "não sincronizado"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Realmente sair do Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Sempre fechar o Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Cancelar transferência de arquivo"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2223,16 +2336,16 @@ msgstr ""
 "Mensagens somente estarão disponíveis para leitura mais tarde se você tiver "
 "o histórico habilitado e contato na sua lista."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2240,11 +2353,11 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2253,12 +2366,12 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens para contatos destes "
 "transportes: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a bloquear um contato. Tem certeza que quer continuar?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2267,56 +2380,56 @@ msgstr ""
 "Este contato irá ver você desconectado e você não irá receber mensagens que "
 "ele enviar para você."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Renomear contato"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Você quer remover o grupo %s da lista?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Também remove todos os contatos neste grupo da sua lista"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Você realmente deseja remover \"%(name)s\" (%(jid)s) da sua lista.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2326,11 +2439,11 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2339,15 +2452,15 @@ msgstr ""
 "Removendo este contato, você também, por padrão, removerá a autorização, "
 "resultando em ele ou ela sempre o verá offiline."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Eu quero que este contato saiba meu status após a remoção"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Os contatos serão removidos da sua lista"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2357,7 +2470,7 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -2365,7 +2478,7 @@ msgstr ""
 "Você está prestes a enviar um status customizado. Tem certeza que quer "
 "continuar?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2374,25 +2487,25 @@ msgstr ""
 "Este contato irá temporariamente ver você como %(status)s, mas somente até "
 "você alterar o seu status. Então ele irá ver o seu status global."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Você deve configurar uma conta antes de poder conversar com outros contatos."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2401,13 +2514,13 @@ msgstr ""
 "O seu servidor não suporta a gravação de informação de metacontatos, então "
 "essas informações não estarão salvas na próxima vez que você conectar."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2417,194 +2530,194 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Arquivo URI inválido:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Você quer enviar este arquivo para %s:"
 msgstr[1] "Você quer enviar estes arquivos para %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Enviar %s para %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Fazer %s e %s metacontatos"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Fazer %s e %s metacontatos"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Mudar mensagem de status"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Publicar sintonia"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicar sintonia"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Configurar serviços..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maximizar tudo"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Enviar m_ensagem de grupo"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Gerenciar contatos"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Editar _grupos"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Remover"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Reconectar"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Histórico"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Gerenciador de histórico"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Ingressar em uma nova Conferência"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Mudar mensagem de status"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Mostre somente na _lista"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor de configurações avançado"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuração da sala"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Exibir todos _eventos pendentes"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Erro na base de dados"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "O que você quer fazer?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Encaminhar mensagens não lidas"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2613,7 +2726,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2621,7 +2734,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2767,16 +2880,16 @@ msgstr "Emoticons desabilitados"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Salvar senha"
 
@@ -2808,10 +2921,18 @@ msgstr "Remover conta _somente do Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?exibir_status:Todos"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Apenas entre e saia"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?exibir_status:Nenhum"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Nova conferência"
@@ -2878,11 +2999,11 @@ msgstr "Entrada inválida"
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certificado já está no arquivo"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2988,90 +3109,113 @@ msgstr "Mensagem destacada de conferência"
 msgid "Group Chat Message Received"
 msgstr "Mensagem de conferência recebida"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dessa sala"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Filiação do contato de conferência:Nenhuma"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Membro"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrador"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Dono"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [bloqueado]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [minimizado]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Conectado"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Download"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Upload"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Tipo: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Parado"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Completo"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?status da transferência:Parado"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Parado"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?status da transferência:Parado"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Livre para conversa"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Afastado"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Ocupado"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Não disponível"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -3120,125 +3264,129 @@ msgstr "(Nada)"
 msgid "Hidden"
 msgstr "Escondido"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversação com %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Histórico de conversação"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Erro de disco"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s é agora %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Erro: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Erro"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status agora é: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Mudar mensagem de status"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Gerenciar marcadores"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "na _lista"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Exibir _lista"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Incapaz de carregar o módulo inativo"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Sem suporte a invisibilidade"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "novo@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novo%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Nome do computador:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Recursos dos Servidores"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "O servidor respondeu: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3397,7 +3545,7 @@ msgstr "_Inscrever"
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3405,51 +3553,57 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde a\n"
 "última vez onde você prestou a atenção a conferência"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Frase"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Ações para \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _dicionário"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL do dicionário não existe \"%s\" e isto não é WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de procura na web não existe \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Procura na web por isto"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Abrir como _link"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "JID inválido:"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3461,30 +3615,35 @@ msgstr[1] "Há %i dias"
 msgid "Write a message.."
 msgstr "Enviar mensagem privada"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Você está prestes a fechar todas as abas"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Você realmente deseja fechar todas?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Conferências"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Conversas privadas"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Mensagens"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Impossível ingressar na sala"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3496,108 +3655,108 @@ msgstr ""
 "outro ocupante.\n"
 "Por favor, especifique um outro apelido abaixo:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Sempre usar este apelido quando houver um conflito"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Você aceita essa requisição na conta %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Autorização HTTP (%(method)s) para %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Uma senha é requerida para ingressar na sala %s. Por favor, digite-a."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Fonte</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Você está banido da sala %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "A sala %s não existe."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "A sala %s não existe."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "A criação de sala é restrita."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Impossível ingressar na sala"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Seu nickname registado deve ser usado na sala %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Você não está na lista de membros da sala %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erro %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Solicitação de inscrição"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observadores"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contato \"%s\" autorizou você para ver seu status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3606,31 +3765,31 @@ msgstr ""
 "Você irá sempre ver ele ou ela como desconectado.\n"
 "Você quer removê-lo ou removê-la da sua lista de contatos?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Desinscrever"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3639,38 +3798,38 @@ msgstr ""
 "Você configurou o Gajim para usar o agente do GPG, mas não há agente do GPG "
 "rodando ou então ele retornou uma frase secreta incorreta.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Frase de acesso errada"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Frase de acesso errada"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "O certificado expirou"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 "Entre com a frase de acesso da chave GPG %(keyid)s para conta (account "
 "%(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3679,77 +3838,82 @@ msgstr ""
 "A chave GPG usada para criptografar esta conversa não é confiável. Você "
 "realmente deseja criptografar esta mensagem?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Erro de certificado SSL"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Transferência de arquivos"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Você enviou com sucesso o %(filename)s para %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s para %(name)s parado."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Transferência de arquivo de %(filename)s para %(name)s parado."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Escolha o arquivo para enviar..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Não foi possível descriptografar a mensagem"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Por favor digite um novo nome de usuário para sua conta local"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Conflito de recurso"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3757,20 +3921,20 @@ msgstr ""
 "Você já está conectado a essa conta com o mesmo recurso. Por favor digite um "
 "novo"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer iniciar uma conversa com voz."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Solicitação de conversa com voz"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Erro ao verificar o certificado SSL"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3781,7 +3945,7 @@ msgstr ""
 "%(error)s\n"
 "Você ainda deseja conectar-se a este servidor?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3794,15 +3958,15 @@ msgstr ""
 "SHA1 fingerprint do certificado:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este erro para este certificado."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3823,7 +3987,7 @@ msgstr ""
 "\n"
 "Você ainda quer conectar e atualizar o fingerprint do certificado?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3831,7 +3995,7 @@ msgstr ""
 "Você está enviando sua senha em uma conexão não-segura. Você deve instalar o "
 "PyOpenSSL para prevenir isto. Você tem certeza que quer fazer isso?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3840,16 +4004,16 @@ msgstr ""
 "Você está prestes a enviar sua senha em um conexão não-criptografada. Tem "
 "certeza que quer fazer isto?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Isto não é uma conferência"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Emoticons desabilitados"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3857,7 +4021,7 @@ msgstr ""
 "Você configurou um tema de emoticons que não foi encontrado, então os "
 "emoticons estão desativados."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3866,11 +4030,11 @@ msgstr ""
 "Você configurou um tema de emoticons que não foi encontrado, então os "
 "emoticons estão desativados."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Isto não é uma conferência"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3878,43 +4042,43 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "padrão"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Entre com a frase de acesso da chave GPG %(keyid)s para conta (account "
 "%(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "A chave GPG expirou"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Sua chave GPG expirou, você será conectado ao %s sem OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso errada"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, reescreva sua frase secreta de GPG ou pressione Cancelar."
@@ -3985,6 +4149,11 @@ msgstr "- as mensagens serão gravadas"
 msgid "- messages will not be logged"
 msgstr "- as mensagens não serão gravadas"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4017,7 +4186,7 @@ msgstr "Sala inválida"
 msgid "The form is not filled correctly."
 msgstr "O apelido possui caracteres não permitidos."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -4148,6 +4317,57 @@ msgstr ""
 "%s\n"
 "Mensagens link-local podem não funcionar adequadamente."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Impossível iniciar o serviço local"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "A imagem não pode ser carregada"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "O serviço retornou um erro."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "A imagem não pode ser carregada"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Criptografia habilitada"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Uma conexão não está disponível"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4173,7 +4393,17 @@ msgstr "Você não pode apagar o seu tema corrente"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Juntar contas"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Usar o Agente G_PG"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Estou de volta."
 
@@ -4194,6 +4424,11 @@ msgstr "Você iniciou uma conversa usando a conta %s"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Todas as janelas de conversa e conferência serão fechadas. Confirma?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Remover"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4387,52 +4622,66 @@ msgstr "Alterar senha"
 msgid "Login Options"
 msgstr "_Emoticons:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "O D-Bus não está presente nesta máquina ou o módulo do Python está faltando"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Mostra uma ajuda para um comando específico"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "comando"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "exibir ajuda no comando"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "exibe ou esconder a janela principal"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Exibir uma janela popup com o próximo evento pendente"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Exibir uma lista de todos os contatos na lista. Cada contato aparecerá em "
 "uma linha separada"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "conta"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "exibir somente os contatos desta conta"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Mudar o status da conta ou contas"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4440,11 +4689,17 @@ msgid ""
 msgstr ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mensagem"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "mensagem de status"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4453,16 +4708,21 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Mudar a prioridade da conta ou das contas"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioridade:"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "prioridade que deseja dar para a conta"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4470,7 +4730,7 @@ msgstr ""
 "mudar status da conta. Se não especificado, tentará mudar o status de todas "
 "as contas existentes com a opção \"sincronizar com status global\" marcada"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4480,30 +4740,30 @@ msgstr ""
 "são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP', apenas configure a 'chave para ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "conteúdos da mensagem"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se especificada, a mensagem será criptografada usando esta chave pública"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificada, a mensagem será enviada usando esta conta"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4513,121 +4773,121 @@ msgstr ""
 "são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP', apenas configure a 'chave para ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "assunto"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "assunto da mensagem"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Envia uma nova messagem para uma conferência em que você tiver ingressado."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "O JID do contato que receberá a mensagem"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Informações detalhadas do contato"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID do contato"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Informações detalhadas do contato"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Enviar arquivo para um contato"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "arquivo"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Lista todas as preferências e seus valores"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ajusta o valor da 'chave' ao 'valor '."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "chave=valor"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'chave' é o nome de preferência, 'valor' é o valor para ajustá-la"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Deleta um item de preferência"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "chave"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a ser deletada"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Escreve o estado atual das preferências do Gajim em um arquivo .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Remover contato da lista"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se especificado, o contato é feito da lista de contatos desta conta"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Retorna o status atual (global a menos que o cliente for especificado)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Retorna a mensagem de status atual (global a menos que a conta for "
 "especificada)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Retorna o número das mensagens não lidas"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Envia XML personalizado"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4636,17 +4896,17 @@ msgstr ""
 "A conta em que o XML será enviado; se não estiver especificado, será enviado "
 "para todas as contas"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Alterar status"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Apelido a ser usado"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4655,19 +4915,19 @@ msgstr ""
 "A conta em que o XML será enviado; se não estiver especificado, será enviado "
 "para todas as contas"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Checar se o Gajim está rodando"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Exibe ou esconder a janela ipython"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4676,16 +4936,16 @@ msgstr ""
 "'%s' não está em sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Você não tem uma conta ativa"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Parece que o Gajim não está rodando. Então você não pode usar o gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4694,16 +4954,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4714,7 +4974,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4723,7 +4983,7 @@ msgstr ""
 "Muitos argumentos. \n"
 "Digite \"%(basename)s help %(command)s\" para mais informações"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4897,11 +5157,6 @@ msgstr "Fim da semana"
 msgid "Weekend!"
 msgstr "Final de semana!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "Conta XMPP %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4926,52 +5181,52 @@ msgstr "A sala foi excluída"
 msgid "You can join this room instead: %s"
 msgstr "Você pode entrar nessa sala ao invés: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erro de SSL desconhecido: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova mensagem simples de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensagem privada da conferência %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensagem enviada por %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mensagem de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s alterou seu status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectou"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectou"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Fora da lista"
 
@@ -5813,22 +6068,18 @@ msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "O Gajim deve iniciar automaticamente em sessão criptografada quando possível?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Lista ordenada de tipos de conexão (separada por espaço) para tentar. Pode "
-"conter tls, ssl ou simples"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5837,11 +6088,11 @@ msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Exibir uma mensagem de alerta antes de usar uma biblioteca padrão SSL."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -5849,37 +6100,37 @@ msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espaços de erros do ssl para ignorar."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Espaço em branco enviado após inatividade"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "Ping XMPP enviado após inatividade"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5888,11 +6139,11 @@ msgstr ""
 "Quantos segundos aguardar a resposta do pacote de tempo-de-vida antes de "
 "tentar reconectar."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 rodando"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5900,21 +6151,21 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Respostas para requisições recebidas"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Requisições recebidas enviadas"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5922,12 +6173,12 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s quer te enviar um arquivo."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5935,53 +6186,63 @@ msgstr ""
 "Ao negociar uma sessão criptografada, o Gajim deve assumir que você quer que "
 "suas mensagens sejam gravadas?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Autenticação anônima"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Autenticação anôn_ima"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Autenticação anôn_ima"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Idioma a usar na verificação ortográficas das palavras"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
@@ -5989,7 +6250,7 @@ msgid ""
 msgstr ""
 "Quantas linhas requisitar ao servidor quando entrar em uma conferência."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
@@ -5997,90 +6258,90 @@ msgid ""
 msgstr ""
 "Quantos minutos esperar para requisitar registros quando entrar em uma sala."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Comendo"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Filme"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Trabalhando"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefone"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Estou fora"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6088,27 +6349,27 @@ msgstr ""
 "Som para tocar quando uma mensagem MUC conter uma das palavras no "
 "muc_hightlight_words, ou quando uma mensagem MUC contiver seu apelido."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "verde"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "mantimento"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "humano"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marinho"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Para"
@@ -6187,37 +6448,50 @@ msgstr "Todas as mensagens não lidas foram encaminhadas."
 msgid "Forward unread message then disconnect"
 msgstr "Encaminhar mensagens não lidas"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "O arquivo está vazio"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "O arquivo não existe"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "criando banco de dados de logs"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "criando banco de dados de logs"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Enviar %s para %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é um arquivo, mas deveria ser um diretório"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é um diretório, mas deveria ser um arquivo"
@@ -6227,11 +6501,11 @@ msgstr "%s é um diretório, mas deveria ser um arquivo"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "azul celeste"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migrando base de dados de registros para índices"
 
@@ -6240,190 +6514,190 @@ msgstr "migrando base de dados de registros para índices"
 msgid "%s is not a valid loglevel"
 msgstr "%s não é um nível de gravação (loglevel) válido"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Não foi possível obter certificado CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Não foi possível descriptografar a assinatura do certificado"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Não foi possível descriptografar a assinatura CRL"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Não foi possível decodificar a chave pública do emissor"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Assinatura do certificado falhou"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Falha na assinatura CRL"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "O certificado ainda não é válido"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "O certificado expirou"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL ainda não é válido"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL expirou"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Erro de formato nos certificados no campo notBefore"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Erro de formato nos certificados no campo notAfter"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erro de formato no campo lastUpdate do CRL"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erro de formato no campo nextUpdate do CRL"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Memória insuficiente"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Certificado próprio"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificado próprio na cadeia de certificados"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Não foi possível obter o certificado do emissor local"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Não foi possível verificar o primeiro certificado"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "A cadeia de certificados é muito longa"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certificado revocado"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Certificado CA inválido"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Limite de comprimento do caminho excedido"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Certificado de propósito não suportado"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certificado não confiável"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certificado rejeitado"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Assunto do emissor não coincide"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Chave identificadora de autoridade e assunto não coincidem"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoridade e número serial do emissor não coincidem"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "O uso das chaves não inclui assinatura de certificado"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Verificação do aplicativo falhou"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Reconecte manualmente."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "O servidor %(name)s respondeu erroneamente à requisição de registro: "
 "%(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "O servidor %s forneceu um formulário de registro diferente"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "O servidor respondeu: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Falha na conexão com o proxy"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Não foi possível conectar a conta %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "A conexão com a conta %s foi perdida. Tentando reconectar."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "A autenticidade do certificado %s pode ser inválida."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6432,7 +6706,7 @@ msgstr ""
 "\n"
 "Erro de SSL: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6441,38 +6715,38 @@ msgstr ""
 "\n"
 "Erro de SSL desconhecido: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "A autenticidade do certificado %s pode ser inválida."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se seu login e senha estão corretos."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Enviar contato: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Enviar contatos:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Não baixado por causa do status invisível"
 
@@ -7344,255 +7618,280 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Não disponível"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "Livre para _conversa"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?status da transferência:Parado"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Conectando"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Afastado"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?contato tem status:Desconhecido"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?contato tem status:Com erros"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Inscrição existente:Nenhuma"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Para"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "De"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Ambos"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Pergunta (para inscrição):Nenhuma"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Regra do contato para conversa em grupo:Nenhuma"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderador"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Participantes"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Participante"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Visitante"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "está digitando..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "parou de digitar"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensagem pendente"
 msgstr[1] "%d mensagens pendentes"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " da sala %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " do usuário %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " de %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento pendente"
 msgstr[1] "%d eventos pendentes"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Por favor, eu gostaria de adicioná-lo à minha lista."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Tempo esgotado ao carregar a imagem"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "A imagem é grande demais"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL ainda não é válido"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Tempo esgotado ao carregar a imagem"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "A informação do registo para o transporte %s não chegou a tempo"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "mensagem"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adiciona-lo à minha lista."
 
@@ -7631,43 +7930,43 @@ msgstr ""
 "O bus de sessão não está disponível.\n"
 "Veja http://trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor verifique se o Avahi ou o Bonjour estão instalados."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Impossível iniciar o serviço local"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível conectar-se à porta %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor verifique se o serviço avahi-daemon está rodando."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível alterar status da conta \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Sua mensagem não pode ser enviada."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contato está offline. Sua mensagem não pode ser enviada."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7914,6 +8213,11 @@ msgstr "_Banir"
 msgid "_Add to Roster"
 msgstr "_Adicionar à lista"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Executar comando"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8196,11 +8500,11 @@ msgstr "Sobre"
 msgid "Con_tinue"
 msgstr "_Continuar"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -8209,33 +8513,33 @@ msgstr "_Cancelar"
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta do arquivo"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Transferência de arquivos"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "lista de transferência de arquivos"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Uma lista de transferências de arquivo ativas, completadas e paradas"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Limpar"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Remover da lista as transferências de arquivos completas, canceladas ou "
 "interrompidas"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Remover a transferência de arquivo da lista."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8243,33 +8547,38 @@ msgstr ""
 "Esta ação remove uma única transferência de arquivo da lista. Se a "
 "transferência está ativa, isto vai pará-la e removê-la"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Cancela a transferência de arquivo selecionada e remove o arquivo incompleto"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Cancelar transferência de arquivo"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Cancela a transferência de arquivo selecionada"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Enviar & fechar"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Esconder a janela"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Exibir um alerta visual quanto uma transferência de arquivo terminar"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Exibe uma lista de transferências de arquivos entre você e os outros"
 
@@ -8278,7 +8587,7 @@ msgid "Register to"
 msgstr "Registrar para"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8309,21 +8618,21 @@ msgstr "Fonte"
 msgid "Clear formatting"
 msgstr "Limpar formatação"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Exibe uma lista de emoticons (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Escolha o arquivo para enviar..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Exibe uma lista de emoticons (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Evento"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Eventos"
@@ -8386,7 +8695,7 @@ msgstr "<b>Fonte</b>"
 msgid "<b>#</b>"
 msgstr "<b>Fonte</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9145,10 +9454,6 @@ msgstr "_Abrir..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor de configurações avançadas</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avançado"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Iniciar _conversa"
@@ -9391,7 +9696,7 @@ msgid "_Open Email Composer"
 msgstr "_Abrir cliente de e-mail"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Iniciar conversa"
 
@@ -9436,6 +9741,10 @@ msgstr "Preferências"
 msgid "Default:"
 msgstr "Padrão"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Adicionar novo contato"
@@ -9461,6 +9770,16 @@ msgstr "_Apelido:"
 msgid "_Group:"
 msgstr "_Grupo:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID do usuário:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Apelido"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9499,6 +9818,11 @@ msgstr ""
 "Você deve estar conectado para que o transporte \n"
 "possa adicionar um contato desse protocolo."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Mudar mensagem de status"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Humor:</b>"
@@ -9724,10 +10048,9 @@ msgstr "_Executar comando..."
 msgid "_Verify"
 msgstr "_Verificar"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Contas"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(Informações <b>ESession</b>)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9754,11 +10077,6 @@ msgstr "Exibir somente _ativos"
 msgid "Show Transports"
 msgstr "Exibir trans_portes"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Transferência de arquivos"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9833,33 +10151,23 @@ msgstr "Minimizar ao entrar automaticamente"
 msgid "Pr_int status:"
 msgstr "Imprimir status:"
 
-#: gajim/data/gui/exception_dialog.ui:7
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Exception"
-msgstr "Descrição"
+msgid ""
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
+msgstr "Não é provavelmente fatal, mas deve ser reportado aos desenvolvedores."
 
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:115
 #, fuzzy
 msgid "Report Bug"
 msgstr "_Reportar erro"
 
-#: gajim/data/gui/exception_dialog.ui:89
-#, fuzzy
-msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
-msgstr "Não é provavelmente fatal, mas deve ser reportado aos desenvolvedores."
-
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Solicitação de inscrição"
-
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Negar"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9867,16 +10175,11 @@ msgstr ""
 "Negar a autorização do contato, assim ele não poderá saber quando você está "
 "conectado"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Ações"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_torizar"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
 "Autorize o contato para que ele ou ela saiba quando você estiver conectado"
@@ -9895,11 +10198,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Presença"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Convidar amigos!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9908,15 +10211,20 @@ msgstr ""
 "Você está prestes a iniciar uma Conversa Multi-Usuário (MUC).\n"
 "Selecione os contatos que você quer convidar"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Por favor, selecione um servidor MUC."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Servidor MUC"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Con_vidar"
 
@@ -10036,11 +10344,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Limpando"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10202,6 +10505,16 @@ msgstr "Exibir todos _eventos pendentes"
 msgid "Mute Sounds"
 msgstr "Sons mudos"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Preferências"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Sair"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Para:"
@@ -10610,14 +10923,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configuração da sala"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Um cliente de IM Jabber"
@@ -10743,6 +11048,31 @@ msgid "Plugin manager"
 msgstr "Falha ao registrar"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "Conta XMPP %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Descrição"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>alguem@algumacoisa.com</b> gostaria que você <b>adicionasse</b> alguns "
+#~ "contatos em sua lista de contatos."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Lista ordenada de tipos de conexão (separada por espaço) para tentar. "
+#~ "Pode conter tls, ssl ou simples"
+
+#~ msgid "_Actions"
+#~ msgstr "_Ações"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Requer o python-dbus."
 
@@ -10944,12 +11274,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Uso: /%s, esconde os botões do bate-papo."
 
-#~ msgid "File is empty"
-#~ msgstr "O arquivo está vazio"
-
-#~ msgid "File does not exist"
-#~ msgstr "O arquivo não existe"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10979,58 +11303,6 @@ msgstr "Falha ao registrar"
 #~ msgstr "Requer o python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?status da transferência:Parado"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?status da transferência:Parado"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?contato tem status:Desconhecido"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?contato tem status:Com erros"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Inscrição existente:Nenhuma"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Pergunta (para inscrição):Nenhuma"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Regra do contato para conversa em grupo:Nenhuma"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Filiação do contato de conferência:Nenhuma"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?exibir_status:Todos"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?exibir_status:Nenhum"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Disponível"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "conta"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "mensagem"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "prioridade:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "sala"
 
@@ -11042,30 +11314,6 @@ msgstr "Falha ao registrar"
 #~ msgid "?CLI:password"
 #~ msgstr "senha"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Conferências"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Download"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Upload"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?status da transferência:Parado"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Cliente:Desconhecido"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?SO:Desconhecido"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Tempo:Desconhecido"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Usar DBus e Notification-Daemon para exibir notificações"
 
@@ -11275,9 +11523,6 @@ msgstr "Falha ao registrar"
 #~ msgid "Choose _Key..."
 #~ msgstr "_Escolha a chave..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Usar o Agente G_PG"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr "Se marcado, o Gajim obterá a senha de um agente GPG como o Seahorse"
@@ -11409,18 +11654,6 @@ msgstr "Falha ao registrar"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Entrada XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtro:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Entrada XML</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Enviar"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Console XML para %s"
 
@@ -11829,9 +12062,6 @@ msgstr "Falha ao registrar"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Convidar contatos para a conversa (Ctrl+G)"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(Informações <b>ESession</b>)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Nome do contato"
@@ -11844,13 +12074,6 @@ msgstr "Falha ao registrar"
 #~ msgid "All Chat Histories"
 #~ msgstr "Totos os status"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>alguem@algumacoisa.com</b> gostaria que você <b>adicionasse</b> alguns "
-#~ "contatos em sua lista de contatos."
-
 #~ msgid "More"
 #~ msgstr "Mais"
 
@@ -12768,9 +12991,6 @@ msgstr "Falha ao registrar"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
@@ -12815,12 +13035,6 @@ msgstr "Falha ao registrar"
 #~ "Uso: /%s <ação>, emite a ação à  sala atual. Use a terceira pessoa (por "
 #~ "exemplo: /%s explodes.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Criptografia habilitada"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Criptografia desabilitada"
-
 #~ msgid "Click to see past conversation in this room"
 #~ msgstr "Clique para ver o histórico de conversas nesta sala"
 
diff --git a/po/ru.po b/po/ru.po
index ca0ee0659..9c68f8878 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2013-09-21 13:55+0300\n"
 "Last-Translator: Fomin Denis <fominde@gmail.com>\n"
 "Language-Team: Linux Support LLC\n"
@@ -33,20 +33,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Ошибка."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Отправить файл?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Если вы пошлете файл %s, он/она узнает ваш настоящий Jabber ID."
@@ -101,70 +101,70 @@ msgstr "Время"
 msgid "Progress"
 msgstr "Прогресс"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Вы"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Получатель:"
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сохранено в: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Открыть папку с принятым файлом"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Передача отменена"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получатель: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Сообщение об ошибке: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Передача файла остановлена"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, fuzzy, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -174,125 +174,125 @@ msgstr ""
 "Файл %(file)s был получен, но возможно с ошибками.\n"
 "Хотите загрузить его еще раз?"
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Выбрать файл для отправки..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Отправить"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Описание: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Нет доступа к файлу"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не могу заместить существующий файл «%s»"
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Что вы хотите сделать?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папка «%s» не доступна для записи"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "У вас нет права создавать файлы в этой директории."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Сохранить файл как..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправить вам файл:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Проверяется файл ..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 msgid "File error"
 msgstr "Файловая ошибка"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Неверный файл"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Имя: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Отправитель:"
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Пауза"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Продолжить"
 
@@ -454,45 +454,65 @@ msgstr "Возможность запроса порта для передачи
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Требует python-gupnp-igd."
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "?features:Доступно"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Функции"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Ошибка чтения файла:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Ошибка обработки файла:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Расширение не поддерживается"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Изображение нельзя сохранить в формате %(type)s. Сохранить как "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Сохранить изображение как..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Есть "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "Неизвестен"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "Неизвестна"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Time:Неизвестно"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "?Роль в групповом чате:<b>Роль:</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -501,7 +521,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -510,39 +530,49 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Нет ожидающего запроса на подписку."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Все файлы"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Делаю уборку"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Управление профилями прокси"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -585,13 +615,13 @@ msgid "_New Group Chat"
 msgstr "В _новую комнату"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
@@ -604,7 +634,7 @@ msgstr "Вы не против, если я добавлю Вас к себе в
 msgid "Send Single _Message…"
 msgstr "Отправить _сообщение"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Установи_ть статус"
@@ -622,25 +652,25 @@ msgstr "_Управление транспортом"
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "П_ереименовать"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Разблокировать"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Блокировать"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "_Удалить"
@@ -654,210 +684,230 @@ msgstr "_Информация о контакте"
 msgid "Send File..."
 msgstr "Отправить _файл..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Пригласить _участников"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Добавить в ростер"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "Тест звука"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "Тест видео"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Информация о контакте"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_История"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Управление комнатой"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Изменить _тему..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Настроить _комнату..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Уничтожить комнату"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Изменить _ник..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Добавить комнату в закладк_и"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Запросить право говорить"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Предустановленные сообщения:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Сворачивать при закрытии"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "В_ыполнить команду..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Выйти"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Войти в комнату"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Добавить контакт..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Просмотреть сервисы"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Отправить одиночное _сообщение..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Расширенные"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Редактировать Настройки Архивации"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Синхронизировать"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Админ"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Отправить сообщение сервера..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Установить сообщение дня..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Обновить сообщение дня..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Удалить сообщение дня"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Нет доступной учетной записи"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Учётные записи"
+
+#: gajim/history_manager.py:56
 msgid "Usage:"
 msgstr "Использование:"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 msgid "Options:"
 msgstr "Параметры:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr "показать это сообщение и закончить работу"
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Не могу найти базу данных истории"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Ник"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Сообщение"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Тема"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ, ЕСЛИ GAJIM ЗАПУЩЕН)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -872,95 +922,95 @@ msgstr ""
 "\n"
 "Если вы нажали ДА, пожалуйста подождите..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr "Очистка базы данных"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Экспортирую историю..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s в %(time)s сказал: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Вы точно хотите удалить лог %(jid)s?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Вы точно хотите удалить логи выделенного контакта?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Сервис не обнаружен"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr "Подтверждение удаления"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы точно хотите удалить выделенное сообщение?"
 msgstr[1] "Вы точно хотите удалить выделенные сообщения?"
 msgstr[2] "Вы точно хотите удалить выделенные сообщения?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Это необратимая операция"
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Получаю данные..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "Неверный формат даты"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Дата должна быть в формате: YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Информация получена"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Необходимо присоединиться к серверу для обновления личной информации."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Отправляю данные..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Информация НЕ опубликована"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Публикация vCard не удалась"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -977,10 +1027,10 @@ msgstr "Имя контакта: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Общие"
@@ -1057,48 +1107,48 @@ msgid "Yahoo! Address:"
 msgstr "Адрес Yahoo:"
 
 #: gajim/dialogs.py:897
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Please fill in the data of the contact you want to add to your account <b>"
 "%s</b>"
 msgstr ""
-"Заполните данные о контакте,\n"
-"который хотите добавить в ростер учетной записи %s"
+"Заполните данные о контакте, который хотите добавить в ростер учетной записи "
+"<b>%s</b>"
 
 #: gajim/dialogs.py:900
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Заполните данные о контакте, который вы хотите добавить"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Неверный ID пользователя"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "ID пользователя не должен содержать ресурс."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Вы не можете добавлять себя в свой ростер."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Контакт уже в ростере"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Этот контакт уже содержится в вашем ростере."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ID пользователя:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Ошибка при добавлении службы. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1106,50 +1156,50 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Jabber/XMPP-клиент на GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Версия GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Версия PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Разработчики:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Разработчики прошлых версий:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "И наконец, мы хотели бы поблагодарить всех мейнтейнеров пакетов."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Яков Безруков <nebulam51@gmail.com>\n"
@@ -1158,12 +1208,12 @@ msgstr ""
 "Денис Фомин <fominde@mail.ru>\n"
 "Григорий Сарницкий <sargrigory@ya.ru>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Нет словаря для языка %s"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1174,12 +1224,12 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка "
 "%s или выберите другой язык, исправив настройку speller_language."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Небезопасное соединение"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1192,278 +1242,302 @@ msgstr ""
 "подключения не рекомендуется.\n"
 "Вы действительно хотите это сделать?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, я действительно хочу соединиться небезопасно"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "Не _спрашивать меня снова"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "_Продолжить"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "_Заменить"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Неверное имя пользователя"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Имя файла содержит недопустимые символы."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Запрос подписки"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запрос на подписку для учетной записи %(account)s от %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Войти в комнату"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Неверная комната"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Неверное имя пользователя"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Создайте новую тему с желаемым названием."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Неверный JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Сервер вернул неправильный ответ! (%s)"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "URL «%s» сервера не является корректным"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Имя"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Учётная запись не подключена к серверу"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Вы не можете синхронизировать учетную запись если она не подключена."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Синхронизировать"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Возобновлённая беседа"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Новая комната"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Добавить новый контакт"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Чтобы изменить пароль, необходимо подключиться к серверу."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Необходимо ввести пароль."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковыми."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Контакт подключился"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Новое сообщение"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Контакт изменит статус"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Новое сообщение для учетной записи %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Сообщение"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "От %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Соединение недоступно"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Удостоверьтесь, что вы подключены к «%s»."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Не удалось передать сообщение %s — этот JID неверен."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Делаю уборку"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Фильтр:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML Ввод</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Отправить"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "добавить"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "изменить"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "удалить"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1472,28 +1546,28 @@ msgstr ""
 "<b>%(jid)s</b> хочет <b>%(action)s</b> несколько контактов в ваш список "
 "контактов."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Добавить"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Изменить"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Удалить"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Группы"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s предложил мне добавить вас в мой список контактов."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1501,7 +1575,7 @@ msgstr[0] "<b>Время контакта:</b>"
 msgstr[1] "Добавлены контакты %s"
 msgstr[2] "Добавлены контакты %s"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1509,179 +1583,179 @@ msgstr[0] "<b>Время контакта:</b>"
 msgstr[1] "Удалены контакты %s"
 msgstr[2] "Удалены контакты %s"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Настройки архивации для %s"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "Настройки архивации для %s"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Ошибка: Файл \"%s\" не существует"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Ошибка"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Список доступа <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Список доступа для %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Список доступа"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Номер: %(order)s, действие: %(action)s, тип: %(type)s, значение: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Номер: %(order)s, действие: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Изменить правило</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавить правило</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки доступа для %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Недопустимое имя списка"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для нового списка доступа."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Вы приглашены в конференцию"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact приглашает вас присоединиться к обсуждению."
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact приглашает вас в комнату %(room_jid)s."
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Вы принимаете приглашение?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 #, fuzzy
 msgid "Reason (if you decline):"
 msgstr "AWAY [<причина>], устанавливает флаг отсутствия"
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "Выберите сертификат владельца #PCKS12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "Файлы PKCS12"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Выберите звуковой файл"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "В формате Wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Выбрать картинку"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Картинки"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "Выбрать Архив"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "Zip файлы"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когда %s происходит:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавление специального уведомления для %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "аудио и видео"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "аудио"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "видео"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s хочет начать %(type)s сеанс с вами. Вы хотите ответить?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr "Сертификат учетной записи %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1705,69 +1779,97 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Подтверждение SSL сертификата"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 #, fuzzy
 msgid "View cert…"
 msgstr "Просмотреть журнал"
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Передача файлов"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E шифрование выключено"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s теперь известен как %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s теперь %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы больше не находитесь в комнате «%(room)s» или «%(nick)s» вышел."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Сервер не умеет хранить метаконтакты"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Смена темы"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Введите новую тему:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Смена ника"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Введите новый ник, который вы хотите использовать:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Неверное имя комнаты"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
 # смотря где вылазит меседж - нужно присмотреться
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Удаление %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1776,247 +1878,257 @@ msgstr ""
 "Вы собираетесь полностью уничтожить эту комнату.\n"
 "Можете указать причину:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Можете указать альтернативную комнату:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "и заверено"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "и НЕ заверено"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s шифрование %(status)s включено %(authenticated)s.\n"
 "Для сеанса %(logged)s сохранена история сообщений."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Беседа с "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Возобновлённая беседа"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s установил(а) тему: %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Любой участник может увидеть ваш настоящий JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr "Теперь в комнате отображаются недоступные участники"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr "теперь в комнате не отображаются недоступные участники"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Запись логов конференции включена"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Запись логов конференции выключена"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Конференция не анонимна"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Конференция частично анонимна"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Конференция полностью анонимна"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(jid)s был приглашен в комнату"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Запись логов конференции включена"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Новая комната была создана"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер присвоил или изменил ваш ник в комнате"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил(а) %(nick)s заходить в комнату: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "ранг изменен"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "настройки комнаты были изменены на 'только для участников'"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "выключение сервера"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(actor)s присвоил %(nick)s ранг %(affiliation)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(actor)s присвоил %(nick)s обязанности %(role)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Обязанности %(nick)s были изменены на %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты «%s»?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Выгоняем %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Передача файлов"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Не удалось произвести передачу файлов"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Показать список форматирования"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 #, fuzzy
 msgid "Formatting is not available so long as GPG is active"
 msgstr "Форматирование невозможно если включено GPG"
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
 msgstr "Этот контакт не поддерживает HTML"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s состояние : %(state)s, причина: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s из комнаты %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Установление сеанса отменено"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "История сеанса БУДЕТ сохранена на сервере"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "История сеанса НЕ БУДЕТ сохранена на сервере"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Сеанс зашифрован"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " и БУДЕТ сохранена история сообщений"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " и НЕ БУДЕТ сохранена история сообщений"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2024,16 +2136,16 @@ msgstr ""
 "Личность удаленного контакта не подтверждена. Нажмите на кнопку со щитом для "
 "подробностей."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E шифрование выключено"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Получено новое сообщение от «%s»"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2041,7 +2153,7 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2050,7 +2162,7 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2059,92 +2171,92 @@ msgstr ""
 "Не удалось расшифровать сообщение от %s\n"
 "Возможно, оно было испорчено."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s теперь %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 msgid "File transfer"
 msgstr "Передача файлов"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr "Размер"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr "_Принять"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Присоединиться"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Удаленный контакт остановил передачу"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Ошибка открытия файла"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Комнаты"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Транспорты"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Была отправлена авторизация"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Теперь «%s» будет знать о вашем статусе."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Авторизация была удалена"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr "OpenPGP использовать невозможно"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2152,11 +2264,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2164,37 +2276,37 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "не синхронизировано"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Закрыть Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы точно хотите закрыть Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Всегда закрывать Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "Идет передача файлов"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "Если выйти сейчас, передача файла остановится. Выйти?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2202,16 +2314,16 @@ msgstr ""
 "Сообщения будут доступны для чтения позже, если у вас активирована опция "
 "истории."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт «%s» будет удален"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2219,11 +2331,11 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2232,11 +2344,11 @@ msgstr ""
 "У вас больше не будет возможности приема и отправки сообщений через эти "
 "транспорты:%s."
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Вы точно хотите заблокировать контакт?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2245,57 +2357,57 @@ msgstr ""
 "Этот контакт будет видеть вас как отключенного, а вы не будете получать от "
 "него сообщения."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Назначить ключ OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» будет удален из вашего ростера"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Вы собираетесь удалить «%(name)s» (%(jid)s) из вашего списка контактов.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2305,11 +2417,11 @@ msgstr ""
 "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
 "оффлайне."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2318,15 +2430,15 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2336,12 +2448,12 @@ msgstr ""
 "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
 "оффлайне."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Вы точно хотите послать другой статус?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2351,25 +2463,25 @@ msgstr ""
 "вы не измените свой глобальный статус. Тогда этому контакту станет виден "
 "глобальный статус."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -2377,12 +2489,12 @@ msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Эта информация не будет "
 "сохранена при следующем подключении."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы точно хотите создать метаконтакт?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2392,11 +2504,11 @@ msgstr ""
 "Обычно используется, когда один и тот же человек имеет несколько учетных "
 "записей в Jabber или на транспортах."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2404,180 +2516,180 @@ msgstr[0] "Хотите отправить файл %s:"
 msgstr[1] "Хотите отправить файлы %s:"
 msgstr[2] "Хотите отправить файлы %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Отправить %s контакту %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "Сделать %s первым контактом"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Обьединить %s и %s в метаконтакт"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "Отправлять Местоположение"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Настроить Сервисы..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Редактировать _группы"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Переподсоединиться"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Выйти"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_История"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Войти в новую комнату"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Изменить сообщение о статусе"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Отображать значок в области уведомлений:"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 msgid "Show only critical errors"
 msgstr "показывать только сообщения об ошибках"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Выводить xml станзы и другую отладочную информацию"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 msgid "Use defined profile in configuration directory"
 msgstr "Использовать определенный профиль из каталога с настройками"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 msgid "Set configuration directory"
 msgstr "Установить каталог загрузки конфигурации"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr "Настройки системы логирования"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показать непросмотренные _события"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Что вы хотите сделать?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Соединяюсь"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Передача файла %(filename)s от %(name)s не удалась."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Переслать непрочитанные сообщения"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2586,7 +2698,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2594,7 +2706,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2740,16 +2852,16 @@ msgid "To unregister from a server, account must be enabled."
 msgstr ""
 "Для удаления регистрации с сервера, учетная запись должна быть активна."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Сохранить пароль"
 
@@ -2779,10 +2891,18 @@ msgstr "Удалить только из Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr "Ничего не удалять. Я попробую позже."
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Все"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Нет"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Новая комната"
@@ -2849,11 +2969,11 @@ msgstr "Неверная запись"
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Сертификат уже находится в файле"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
@@ -2957,90 +3077,112 @@ msgstr "Вас упомянули в комнате"
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s этой комнаты"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Отсутствует"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Участник"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Администратор"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Владелец"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr "[заблокировано]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr "[свернуто]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Подключен"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Отключен"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Скачать"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Загрузить"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Тип: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Передано: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Не начато"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Остановлено"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Завершено"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Приостановлено"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Ожидание"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Передается"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Статус: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "Доступен"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Готов поболтать"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Ушел"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Занят"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Отключен"
 
@@ -3089,123 +3231,127 @@ msgstr "(Нет)"
 msgid "Hidden"
 msgstr "Скрытый"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr "Компьютер перешел в спящий режим"
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "История"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Ошибка записи на диск"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s теперь %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Ошибка: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Ошибка"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус установлен в: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Изменить сообщение о статусе"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Управление закладками"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "Скрыть _ростер"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Показать _ростер"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "Невозможно загрузить изображение"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Тип не поддерживается: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "Это поле обязательно"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Хост: "
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Параметры сервера"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Сервер ответил: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3363,7 +3509,7 @@ msgstr "_Подписаться"
 msgid "_Unsubscribe"
 msgstr "_Отписаться"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3371,52 +3517,59 @@ msgstr ""
 "Текст под этой линией был сказан после того,\n"
 "как вы последний раз заглядывали в эту комнату"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Цитировать"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия для «%s»"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "В URL словаря отсутствует «%s» и это не WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "В URL Web-поиска отсутствует «%s»"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Открыть как _ссылку"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Неверный JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+#, fuzzy
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr "С момента последней отправки сообщения"
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3429,30 +3582,35 @@ msgstr[2] "%(nb_days)i  дней назад"
 msgid "Write a message.."
 msgstr "Получить сообщение"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Вы собираетесь закрыть несколько вкладок"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Действительно закрыть их всех?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Комнаты"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Личные беседы"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Сообщения"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Не получается войти в комнату"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3464,109 +3622,109 @@ msgstr ""
 "другим пользователем.\n"
 "Укажите другой ник:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Всегда использовать этот ник в случае конфликта"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Вы принимаете запрос %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Соединение разорвалось"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Чтобы войти в комнату %s, нужен пароль."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Шрифт</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Вам запрещено входить в комнату <b>%s</b>."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Комнаты <b>%s</b> не существует."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Комнаты <b>%s</b> не существует."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Создание комнат запрещено."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Не получается войти в комнату"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr ""
 "Необходимо использовать ваш зарегистрированный ник в комнате <b>%s</b>."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас нет в списке членов комнаты %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Ошибка %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "ошибка при отправке %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Запрос подписки"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» отозвал подписку с вами"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3575,31 +3733,31 @@ msgstr ""
 "Вы всегда будете видеть его или её как отключенными.\n"
 "Удалить его или её из контакт-листа?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "От подписки отказался"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с «%s» не может быть установлена"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, fuzzy, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "Принять приглашение в чат?"
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
@@ -3607,36 +3765,36 @@ msgstr ""
 "Gajim настроен на использование OpenPGP агента, но OpenPGP агент не запущен "
 "или он возвратил неверный пароль.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без ключа OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Неверная парольная фраза"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Неверная парольная фраза"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Сервер требует сертификат TLS"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Введите пароль для сертификата учетной записи %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
@@ -3644,77 +3802,82 @@ msgstr ""
 "Ключ OpenPGP используемый для шифрования не является доверенным. Вы "
 "действительно хотите зашифровать эти сообщения?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 #, fuzzy
 msgid "Oauth2 Credentials"
 msgstr "Сетевые учётные сведения"
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправить вам файл."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Ошибка SSL сертификата"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 msgid "File Transfer Failed"
 msgstr "Не удалось произвести передачу файлов"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Передача файла %(filename)s от %(name)s не удалась."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Передача файла %(filename)s от %(name)s не удалась."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Передача файла %(filename)s к %(name)s не удалась."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Выбрать файл для отправки..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Сообщение не удалось расшифровать"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Такое имя уже есть"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Введите новое имя пользователя для локальной учетной записи"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Такое имя уже есть"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3722,20 +3885,20 @@ msgstr ""
 "Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
 "другой ресурс"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хочет начать видео сеанс."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Запрос аудио сеанса"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Ошибка при проверке SSL сертификата"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3746,7 +3909,7 @@ msgstr ""
 "%(error)s\n"
 "Вы всё ещё хотите подключиться к этому серверу?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3759,15 +3922,15 @@ msgstr ""
 "Отпечаток SHA1 сертификата:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Игнорировать эту ошибку для данного сертификата."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3787,7 +3950,7 @@ msgstr ""
 "Новый отпечаток: %(new)s\n"
 "Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3795,39 +3958,39 @@ msgstr ""
 "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
 "(Установите PyOpenSSL, чтобы этого не происходило.)"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Это не комната"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Смайлики выключены"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Тема смайликов не найдена, они будут отключены."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr "Тема смайликов не найдена, они будут отключены."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Это не комната"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3835,30 +3998,30 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "По_умолчанию"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Требуется парольная фраза"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введите пароль для OpenPGP ключа %(keyid)s (аккаунт %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 msgid "OpenPGP key expired"
 msgstr "Срок действия ключа OpenPGP истёк"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
@@ -3866,11 +4029,11 @@ msgstr ""
 "Срок действия вашего ключа OpenPGP истёк, вы будете подключены к %s без "
 "использования OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Неверная парольная фраза"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Введите парольную фразу для OpenPGP еще раз или нажмите «Отмена»."
 
@@ -3941,6 +4104,11 @@ msgstr "— сообщения будут записаны в лог"
 msgid "- messages will not be logged"
 msgstr "— сообщения не будут записаны в лог"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3973,7 +4141,7 @@ msgstr "Составлять вход"
 msgid "The form is not filled correctly."
 msgstr "Часы установлены неправильно"
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Невидимка"
 
@@ -4107,6 +4275,56 @@ msgstr ""
 "%s\n"
 "Возможно, обмен локальными сообщениями работает не верно."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Не могу запустить локальный сервис"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Не могу загрузить изображение"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Сервис ответил ошибкой."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Не могу загрузить изображение"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Подключение недоступно"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Тема"
@@ -4132,7 +4350,17 @@ msgstr "Вы не можете удалить вашу текущую тему"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Объединенные учетные записи"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Использовать GPG _Agent"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Скоро буду."
 
@@ -4155,6 +4383,11 @@ msgstr "У вас есть окна чата под учётной запись�
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Удалить"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4349,51 +4582,63 @@ msgstr "Изменить пароль"
 msgid "Login Options"
 msgstr "Параметры:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "На машине отсутствует D-Bus или модуль питона для нее"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Показывает помощь для конкретной команды"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "команда"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "показать помощь по команде"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Скрывает или показывает окно ростера"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Показывать окно со следующим непрочитанным сообщением"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
 "строке"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+msgid "?CLI:account"
+msgstr "?CLI:учетная запись"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "показывать контакты только для данной учетной записи"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Показывает список зарегистрированных учетных записей"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Изменяет статус учетной записи или записей"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+msgid "?CLI:status"
+msgstr "?CLI:статус"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4401,11 +4646,16 @@ msgstr ""
 "один из: отключен, в сети, готов поболтать, отошел, недоступен, не "
 "беспокоить, невидимка. Если не указано, использовать предыдущий статус."
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+msgid "?CLI:message"
+msgstr "?CLI:сообщение"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "сообщение о статусе"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4414,16 +4664,20 @@ msgstr ""
 "изменить статус всех учетных записей, у которых установлена опция "
 "«синхронизировать с глобальным статусом»"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Изменяет приоритет учетной записи или записей"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+msgid "?CLI:priority"
+msgstr "?CLI:приоритет"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "приоритет, который вы хотите назначить для учетной записи"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4432,7 +4686,7 @@ msgstr ""
 "всех учетных записей, у которых установлена опция «синхронизировать с "
 "глобальным статусом»"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4442,31 +4696,31 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "если указано, сообщение будет зашифровано с использованием открытого ключа"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 "если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4476,124 +4730,124 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "тема"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "тема сообщения"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Отправляет новые сообщения в комнату, к которой вы присоединились."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о учетной записи"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Имя учетной записи"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Путь до файла"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr ""
 "если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "ключ"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "имя параметра, который нужно удалить"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не "
 "указана учетная запись)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Возвращает количество непрочитанных сообщений"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Отправляет произвольный XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "Отправляемый XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4602,15 +4856,15 @@ msgstr ""
 "Учётная запись, которой будет отправлен XML. Если не указано, xml будет "
 "послан всем контактам."
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Изменить аватар"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Использовать картинку"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4618,19 +4872,19 @@ msgstr ""
 "Учётная запись, для которой будет назначен аватар. Если не указано, аватар "
 "будет назначен всем учетным записям."
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Проверить, запущен ли Gajim"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Скрывает или показывает окно ipython"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент «JID контакта»"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4639,15 +4893,15 @@ msgstr ""
 "'%s' не в вашем ростере.\n"
 "Укажите учетную запись для отправки сообщения."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "У вас нет ни одной активной учетной записи"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "По-видимому, Gajim не запущен. Вы не можете использовать gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4656,16 +4910,16 @@ msgstr ""
 "Использование: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4678,7 +4932,7 @@ msgstr ""
 "\n"
 "Команда одна из:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4687,7 +4941,7 @@ msgstr ""
 "Много аргументов. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4861,11 +5115,6 @@ msgstr "Конец недели"
 msgid "Weekend!"
 msgstr "Выходные!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP учетная запись %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4890,52 +5139,52 @@ msgstr "Комната была удалена"
 msgid "You can join this room instead: %s"
 msgstr "Взамен, вы можете присоединиться к комнате: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестная ошибка SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новое личное сообщение из комнаты %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s меняет статус"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s подключается"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s отключается"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Не в ростере"
 
@@ -5780,22 +6029,18 @@ msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Упорядоченный список (разделённый пробелами) типов подключения, которые "
-"будут перепробованы. Может включать tls, ssl или plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -5803,49 +6048,49 @@ msgstr ""
 "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
 "через незащищенное соединение. Может быть 'warn', 'connect', 'disconnect'"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Предупреждать, прежде чем использовать стандартную библиотеку SSL."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Показывать предупреждение перед отправкой пароля через незащищенное "
 "соединение."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Разделенный пробелами список игнорирования ошибок ssl"
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Пробел, посылаемый после бездействия"
 
 # дословно: пинг XMPP послал после бездействия. Возможно, ошибка в оригинале.
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "пинг XMPP, посылаемый после бездействия"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
@@ -5853,11 +6098,11 @@ msgstr ""
 "Время ожидания (в секундах) ответа на пинг перед повторной попыткой "
 "соединения."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Костыль для jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5865,32 +6110,32 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Отвечать на запросы уведомления"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Посылать запросы уведомления"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Разрешить Gajim отправлять информацию о операционной системе, которую вы "
 "используете"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "Разрешить Gajim отправлять ваше локальное время."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5898,52 +6143,62 @@ msgstr ""
 "Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что "
 "вы хотите сохранить историю сообщений?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "Сообщение отправляемое контактам, которых вы хотите добавить"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Анонимная аутентификация"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Анонимная аут_ентификация"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Анонимная аут_ентификация"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Язык, который используется при проверке правописания"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
@@ -5951,7 +6206,7 @@ msgstr ""
 "Количество строк истории сообщений, запрашиваемых при входе в комнату. -1 - "
 "не ограничено, -2 - глобальное значение"
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
@@ -5960,11 +6215,11 @@ msgstr ""
 "За какой период (минут назад) запрашивать историю сообщений при входе в "
 "комнату. -1 - не ограничено, -2 -  глобальное значение"
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
@@ -5974,79 +6229,79 @@ msgstr ""
 "опция НЕ ДОЛЖНА использоваться для включения или выключения модулей. "
 "Используйте графический интерфейс для этого."
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Ем"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Кушаю, так что оставьте сообщение секретарю."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "В кино"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Работаю"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Работаю"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Вышел"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Я здесь."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Меня нет."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Пока!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6055,27 +6310,27 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "зеленый"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "овощной"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "телесный"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "морской"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 msgid "Tor"
 msgstr "Tor"
 
@@ -6152,36 +6407,49 @@ msgstr "Все непрочитанные сообщения отправлен�
 msgid "Forward unread message then disconnect"
 msgstr "Переслать непрочитанные сообщения при отключении"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Пустой файл"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Файл не существует"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "создается БД истории"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "создается БД истории"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Отправить %s контакту %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s должен быть директорией, а не файлом"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Закончить работу"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s должен быть файлом, а не директорией"
@@ -6191,11 +6459,11 @@ msgstr "%s должен быть файлом, а не директорией"
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "синий"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "переносим журнал на индексы"
 
@@ -6204,188 +6472,188 @@ msgstr "переносим журнал на индексы"
 msgid "%s is not a valid loglevel"
 msgstr "%s не является допустимым loglevel"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Не удалось получить сертификат издателя"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Не удалось получить сертификат CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Не удалось расшифровать подпись сертификата"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Не удалось расшифровать подпись CRL"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Не удалось расшифровать открытый ключ издателя"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Ошибка подписи сертификата"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Ошибка подписи CRL"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Сертификат ещё не действителен"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Сертификат просрочен"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL ещё не действителен"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL просрочен"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Ошибка в поле notBefore сертификата"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Ошибка в поле notAfter сертификата"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Ошибка в поле «lastUpdate» CRL"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Ошибка в поле «nextUpdate» CRL"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Сертификат подписан самим владельцем."
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Самостоятельно подписанный сертификат в цепочке сертификатов"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Не удалось получить сертификат локального издателя"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Не удалось подтвердить первый сертификат"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Цепочка сертификатов слишком длинная"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Сертификат аннулирован"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Недопустимый сертификат CA"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Превышено ограничение по длине пути"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Неподдерживаемое назначение сертификата"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Сертификат не является доверенным"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Сертификат отклонен"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Несоответствие поставщика сертификата"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификаторы ключа центра сертификации и владельца не совпадают"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Идентификаторы ключа центра сертификации и издателя не совпадают"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Назначение ключа не включает подписывание сертификата"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Ошибка при проверке приложения"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с учетной записью «%s» была потеряна"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Переподключаться вручную."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s предоставил другую регистрационную форму"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Не могу соединиться с «%s»"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Не могу соединиться с %s"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер ответил: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Соединение с прокси разорвалось"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не могу соединиться с %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Связь с учетной записью %s была потеряна. Попытка подключения."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Достоверность сертификата %s может быть недействительной."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6394,7 +6662,7 @@ msgstr ""
 "\n"
 "Ошибка SSL: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6403,38 +6671,38 @@ msgstr ""
 "\n"
 "Неизвестная ошибка SSL: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Достоверность сертификата %s может быть недействительной."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с «%s»"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с «%s»"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Проверьте правильность логина и пароля."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Контакт для отправки: «%s» (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Контакты для отправки:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Нельзя получить из-за невидимости"
 
@@ -7305,162 +7573,186 @@ msgstr "видео вход"
 msgid "video output"
 msgstr "видео выход"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Имя сервера должно быть от 1 до 1023 символов"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Неверный символ в имени сервера"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Требуется адрес сервера."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Имя должно быть от 1 до 1023 символов"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Неверный символ в имени пользователя."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Имя ресурса должно быть от 1 до 1023 символов"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Неверный символ в ресурсе"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Занят"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Недоступен"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Готов поболтать"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "Д_оступен"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Ушел"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Невидимка"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "Неизвестен"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "Ошибка"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "Нет"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "К"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "От"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Оба"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "Нет"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "Отсутствует"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Модераторы"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Участники"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Участник"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Посетители"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "читает сообщение"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "занят чем-то еще"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "печатает сообщение..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "перестал печатать сообщение"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7468,22 +7760,22 @@ msgstr[0] "%d пропущенное сообщение"
 msgstr[1] "%d пропущенных сообщения"
 msgstr[2] "%d пропущенных сообщений"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " в комнате %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " от пользователя %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " от %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7491,72 +7783,72 @@ msgstr[0] "%d событие пропущено"
 msgstr[1] "%d события пропущено"
 msgstr[2] "%d событий пропущено"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim — %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт-лист?"
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "Привет, я $name."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Не могу загрузить изображение"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Изображение слишком большое"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr "PyCURL не установлен"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 msgid "Error loading image"
 msgstr "Ошибка загрузки изображения"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Данные о регистрации для транспорта %s не пришли вовремя."
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "сообщение"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
@@ -7595,43 +7887,43 @@ msgstr ""
 "Шина D-Bus не доступна.\n"
 "Попробуйте прочитать %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Удостоверьтесь, что Avahi или Bonjour установлен."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Не могу запустить локальный сервис"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не могу использовать порт %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Удостоверьтесь, что демон avahi запущен."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не могу изменить статус учётной записи «%s»"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Ваше сообщение не может быть отправлено."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт не в сети. Отправить сообщение не удалось."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Не удалось соединиться с хостом: истекло время ожидания."
@@ -7871,6 +8163,11 @@ msgstr "_Забанить"
 msgid "_Add to Roster"
 msgstr "_Добавить в ростер"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "В_ыполнить команду..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8151,11 +8448,11 @@ msgstr "Подробнее"
 msgid "Con_tinue"
 msgstr "_Продолжить"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Приостановить"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "О_тменить"
@@ -8164,31 +8461,31 @@ msgstr "О_тменить"
 msgid "_Open Containing Folder"
 msgstr "_Открыть папку с принятым файлом"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Передача файлов"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "список передач"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Список активных, завершенных и остановленных передач файлов"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Очистить"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Удаляет завершенные, отмененные и неудачные передачи из списка"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Удалить передачу из списка."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8196,31 +8493,36 @@ msgstr ""
 "Это действие удаляет единичную передачу из списка. Если передача еще "
 "активна, она сначала останавливается, а затем удаляется"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Отменяет выбранную передачу и удаляет неполные файлы"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Отменить передачу"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Отменяет выбранную передачу"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "Отправить и _закрыть"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Скрывает окно"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомить меня, когда передача файлов закончится"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показать уведомление по окончании загрузки"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Показывает список передач между вами и остальными"
 
@@ -8229,7 +8531,7 @@ msgid "Register to"
 msgstr "Зарегистрировать в"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_ОК"
 
@@ -8260,20 +8562,20 @@ msgstr "Шрифт"
 msgid "Clear formatting"
 msgstr "Удалить форматирование"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Показать набор смайлов (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Выбрать сертификат"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Показать набор смайлов (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "Тип события"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "Описание события"
 
@@ -8335,7 +8637,7 @@ msgstr "<b>Шрифт</b>"
 msgid "<b>#</b>"
 msgstr "<b>Шрифт</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "№"
 
@@ -9071,10 +9373,6 @@ msgstr "_Открыть..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Расширенный редактор настроек</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Расширенные"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Начать _беседу"
@@ -9315,7 +9613,7 @@ msgid "_Open Email Composer"
 msgstr "_Отправить письмо"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Начать беседу"
 
@@ -9360,6 +9658,10 @@ msgstr "Настройки"
 msgid "Default:"
 msgstr "По умолчанию"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Добавить новый контакт"
@@ -9385,6 +9687,16 @@ msgstr "_Ник:"
 msgid "_Group:"
 msgstr "_Группа:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID пользователя:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Ник"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9422,6 +9734,11 @@ msgstr ""
 "Чтобы добавить контакт для этого протокола,\n"
 "нужно соединиться с транспортом."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Изменить сообщение о статусе"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Настроение:</b>"
@@ -9637,10 +9954,9 @@ msgstr "В_ыполнить команду..."
 msgid "_Verify"
 msgstr "_Удостоверить"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Учётные записи"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(информация <b>ESession</b>)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9667,11 +9983,6 @@ msgstr "Показать _только активных"
 msgid "Show Transports"
 msgstr "Показать Т_ранспорты"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Передача файлов"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9741,50 +10052,35 @@ msgstr "_Сворачивать при автовходе"
 msgid "Pr_int status:"
 msgstr "_Показывать статус:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "описание"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Сообщить об ошибке"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Возможно это не так страшно, но все равно стоит сообщить об этом "
 "разработчикам."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Запрос подписки"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Сообщить об ошибке"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Отклонить"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Отклонить авторизацию от контакта (Он не сможет видеть ваш статус)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Действия"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "А_вторизовать"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Авторизовать контакт (он будет видеть ваш статус)"
 
@@ -9802,11 +10098,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Присутствие"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Пригласить друзей!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9815,15 +10111,20 @@ msgstr ""
 "Вы собираетесь начать чат (Multi-User Chat).\n"
 "Выберите контакты, которых вы хотите пригласить"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Выберите сервер конференций."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "сервер MUC"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Пригласить"
 
@@ -9945,11 +10246,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Делаю уборку"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10114,6 +10410,16 @@ msgstr "Показать непросмотренные _события"
 msgid "Mute Sounds"
 msgstr "Выключить звук"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Настройки"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Выйти"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Кому:"
@@ -10514,14 +10820,6 @@ msgstr "Перезаписать?"
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber-клиент для мгновенных сообщений"
@@ -10646,6 +10944,31 @@ msgstr "Недавно:"
 msgid "Plugin manager"
 msgstr "Ошибка в модуле"
 
+#, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP учетная запись %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "описание"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>someone@somewhere.com</b> хочет <b>добавить</b> несколько контактов в "
+#~ "ваш список контактов."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Упорядоченный список (разделённый пробелами) типов подключения, которые "
+#~ "будут перепробованы. Может включать tls, ssl или plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Действия"
+
 #~ msgid "UPower"
 #~ msgstr "UPower"
 
@@ -10856,12 +11179,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Скрыть кнопки в окне беседы"
 
-#~ msgid "File is empty"
-#~ msgstr "Пустой файл"
-
-#~ msgid "File does not exist"
-#~ msgstr "Файл не существует"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10888,51 +11205,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "Требует python-pyopenssl > 0.12 и pyasn1."
 
-#~ msgid "?user status:_Available"
-#~ msgstr "Д_оступен"
-
-#~ msgid "?user status:Available"
-#~ msgstr "Доступен"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "Неизвестен"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "Ошибка"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "Нет"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "Нет"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "Отсутствует"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Group Chat Contact Affiliation:Отсутствует"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Все"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Нет"
-
-#~ msgid "?features:Available"
-#~ msgstr "?features:Доступно"
-
-#~ msgid "?CLI:account"
-#~ msgstr "?CLI:учетная запись"
-
-#~ msgid "?CLI:status"
-#~ msgstr "?CLI:статус"
-
-#~ msgid "?CLI:message"
-#~ msgstr "?CLI:сообщение"
-
-#~ msgid "?CLI:priority"
-#~ msgstr "?CLI:приоритет"
-
 #, fuzzy
 #~ msgid "?CLI:uri"
 #~ msgstr "Неверный хост"
@@ -10947,33 +11219,6 @@ msgstr "Ошибка в модуле"
 #~ msgstr "?CLI:пароль"
 
 #, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Комнаты"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Скачать"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Загрузить"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "Приостановлено"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "Неизвестен"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "Неизвестна"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Time:Неизвестно"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "?Роль в групповом чате:<b>Роль:</b>"
-
-#, fuzzy
 #~ msgid "Credentials"
 #~ msgstr "Сетевые учётные сведения"
 
@@ -11201,9 +11446,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Choose _Key..."
 #~ msgstr "Выбрать _ключ..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Использовать GPG _Agent"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
@@ -11345,18 +11587,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML Ввод</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Фильтр:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML Ввод</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Отправить"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Консоль XML для %s"
 
@@ -11848,9 +12078,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(информация <b>ESession</b>)"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Введите JID или имя контакта"
 
@@ -11866,13 +12093,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "homepage url"
 #~ msgstr "домашняя страница"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>someone@somewhere.com</b> хочет <b>добавить</b> несколько контактов в "
-#~ "ваш список контактов."
-
 #~ msgid "More"
 #~ msgstr "Еще"
 
@@ -11890,12 +12110,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "Please check if avahi/bonjour-daemon is running."
 #~ msgstr "Удостоверьтесь, что демон avahi запущен."
 
-#, fuzzy
-#~ msgid ""
-#~ "<b>Message was corrected. Last message was:</b>\n"
-#~ "  %s"
-#~ msgstr "С момента последней отправки сообщения"
-
 #~ msgid "%s is not the name of a group chat."
 #~ msgstr "%s не является именем комнаты."
 
@@ -12828,9 +13042,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
diff --git a/po/sk.po b/po/sk.po
index b1b0b28a5..fdf9508b0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2010-02-28 20:43+0100\n"
 "Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -26,20 +26,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Chyba."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Skutočne poslať súbor?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "Ak pošlete súbor %s, on/ona budú poznať vaše skutočné Jabber ID."
@@ -90,70 +90,70 @@ msgstr "Čas"
 msgid "Progress"
 msgstr "Stav"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Názov súboru: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Veľkosť: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Vy"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Príjemca: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uložené do: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Prenos súboru dokončený"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Otvoriť priečinok s obsahom"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Prenos súboru bol zrušený"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Spojenie s druhou stranou nie je možné nadviazať."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Príjemca: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová správa: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Prenos súboru bol zastavený"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -161,127 +161,127 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Vyberte súbor na odoslanie..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Poslať"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Popis:"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim nemôže pristupovať k tomuto súboru"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie je možné prepísať existujúci súbor \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Súbor s rovnakým názvom už existuje a nemáte oprávnenie na jeho prepísanie."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Čo si prajete vykonať?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Do priečinku \"%s\" nie je možné zapisovať"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáte oprávnenie vytvoriť súbor v tomto priečinku."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Uložiť súbor ako..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Súbor: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Odosielanie profilu..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Chyba pri prenose súboru"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Nesprávny súbor"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Súbor:"
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Meno: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Odosielateľ: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pozastaviť"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Pokračovať"
 
@@ -440,44 +440,65 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Vyžaduje python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Prítomný"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Funkcia"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Chyba čítania súboru:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Chyba štruktúry súboru:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Rozšírenie nie je podporované"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Obrázok nie je možné uložiť vo formáte %(type)s. Uložiť ako %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Uložiť obrázok ako..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Má"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Klient: Neznámy"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Neznámy"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Čas: Neznámy"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pričlenenie:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -486,7 +507,7 @@ msgstr ""
 "Tento kontakt sa zaujíma o vaše informácie o prítomnosti, ale vy sa "
 "nezaujímate o jeho/jej informácie o prítomnosti"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -495,38 +516,48 @@ msgstr ""
 "Zaujímate sa o informácie o prítomnosti vášho kontaktu, ale on/ona sa "
 "nezaujíma o vaše"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "JID kontaktu, s ktorým chcete komunikovať"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr ""
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čakáte na odpoveď od kontaktu ohľadne vašej požiadavky na zápis"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Nie sú tu žiadne čakajúce požiadavky o zapísanie."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " zdroj s prioritou "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Všetky súbory"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Upratujem"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Spravovať Proxy profily"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -569,13 +600,13 @@ msgid "_New Group Chat"
 msgstr "_Nová diskusná skupina"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
@@ -588,7 +619,7 @@ msgstr "Chcem si vás pridať do svojho zoznamu"
 msgid "Send Single _Message…"
 msgstr "Poslať krátku _správu"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Poslať vlas_tný stav"
@@ -606,25 +637,25 @@ msgstr "S_pravovať transport"
 msgid "_Modify Transport"
 msgstr "_Upraviť transport"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Premenovať"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Odblokovať"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Blokovať"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "O_dstrániť"
@@ -638,212 +669,232 @@ msgstr "_Informácie"
 msgid "Send File..."
 msgstr "Poslať _súbor..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Pozvať _kontakty"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Pridať do zoznamu"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "Zvukový test"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "Video test"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Informácie"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_História"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "S_pravovať miestnosť"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Zmeniť _predmet..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Nastaviť _miestnosť..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Zničiť miestnosť"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Zmeniť p_rezývku..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Zazáložkovať túto miestnosť"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Hlas"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Prednastavené správy:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimalizovať pri zavretí"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Vykonať príkaz"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "O_dpojiť"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Pridať kontakt..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "súbor"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Preskúmať služby"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Poslať krátku _správu..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Predvoľby"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synchronizovať"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Súkromné zoznamy"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML konzola"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Admin"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Poslať serverovú správu..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Nastaviť správu dňa..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Aktualizovať správu dňa..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Odstrániť správu dňa"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Účty"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "Správa:"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Emotikony:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Nie je možné nájsť databázu so záznamami o histórii"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Dátum"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Správa"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Predmet"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Skutočne si želáte vyčistiť databázu? (SILNE SA NEODPORÚČA, KEĎ BEŽÍ GAJIM)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -858,100 +909,100 @@ msgstr ""
 "\n"
 "V prípade, že zvolite Áno, prosíme o strpenie..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Chyba databázy"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Exportovanie záznamov histórie..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o %(time)s povedal: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Skutočne si želáte zmazať vybraných správ?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Služba nebola nájdená"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Zrušiť potvrdenie"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Skutočne si želáte zmazať vybraných správ?"
 msgstr[1] "Skutočne si želáte zmazať vybranú správu?"
 msgstr[2] "Skutočne si želáte zmazať vybrané správy?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Toto je nevratná operácia."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Získava sa profil..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Nie je možné načítať obrázok"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktné informácie"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Formát: YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informácie prijaté"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený k serveru"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Bez pripojenie nemôžete publikovať informácie o vašom kontakte."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Odosielanie profilu..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informácie neboli zverejnené"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -969,10 +1020,10 @@ msgstr "Kontaktné meno: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Všeobecné"
@@ -1059,36 +1110,36 @@ msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať do účtu %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Nespravné ID používateľa"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Nemôžete pridať seba do vášho zoznamu kontaktov."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Chyba pri pridávaní služby. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1096,61 +1147,61 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "GTK+ Jabber klient"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Verzia GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Verzia PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Súčasní vývojári:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Bývalí vývojári:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "V neposlednom rade ďakujeme všetkým správcom balíkov."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Pavol Klačanský <pavol@klacansky.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Slovník pre jazyk %s nie je k dispozícii"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1162,12 +1213,12 @@ msgstr ""
 "pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
 "nastavením premennej setting the speller_language."
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1178,307 +1229,331 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
 "tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Znovu sa už _nepýtať"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Neplatná prezývka"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Prezývka obsahuje nepovolené znaky."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Požiadavka o zapísanie"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Požiadavka na zápis pre účet %(account)s od %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Pripojiť sa k diskusnej skupine"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Neplatná miestnosť"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Neplatná prezývka"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Vytvorte, prosím, čisto novú tému z vami požadovaným názvom."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Nesprávne JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Nesprávna uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Toto nie je diskusná skupina"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Meno"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Tento účet nie je pripojený k serveru"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemôžete sa synchronizovať s kontaktom ak nie je prihlásený."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synchronizovať"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Pokračovanie rozhovoru"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Nová diskusná skupina"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Pridať nový kontakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí sa musia zhodovať."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nová správa"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nová krátka správa"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nová súkromná správa"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Nový e-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakt zmenil stav"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Krátka správa s použitím účtu %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Krátka správa v účte %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Krátku správu"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Od %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Upratujem"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filter:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML vstup</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Poslať"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "pridať"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "upraviť"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "zmazať"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr ""
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Pridať"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Upraviť"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Skupiny"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Chcem si vás pridať do môjho zoznamu."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1486,7 +1561,7 @@ msgstr[0] "Pridaných %s kontaktov"
 msgstr[1] "Pridaných %s kontaktov"
 msgstr[2] "Pridaných %s kontaktov"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1494,180 +1569,180 @@ msgstr[0] "Odstránených %s kontaktov"
 msgstr[1] "Odstránených %s kontaktov"
 msgstr[2] "Odstránených %s kontaktov"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Predvoľby"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Služba vrátila chybu"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Chyba"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Súkromný zoznam <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Súkromný zoznam pre %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Súkromný zoznam"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Poradie: %(order)s, akcia: %(action)s, typ: %(type)s, hodnota: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Poradie: %(order)s, akcia: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upraviť pravidlo</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Pridať pravidlo</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Súkromné zoznamy pre %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Nesprávny názov zoznamu"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte vložiť názov, aby bolo možné vytvoriť nový súkromný zoznam."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete prijať pozvanie?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Vybrať obrázok"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Obrázky"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Vybrať obrázok"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Všetky súbory"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Keď %s sa stane:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Pridáva sa špeciálne oznámenie pre %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "zvuk a video"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "zvuk"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "video"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "pre účet %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1691,315 +1766,353 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Prenos súborov"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E šifrovanie zakázané"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je známy ako %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je teraz %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Server nepodporuje ukladanie metakontaktov"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Nesprávne Jabber ID diskusnej skupiny"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Ničí sa %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "a overený"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "a NEoverený"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Rozhovor s "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Pokračovanie rozhovoru"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s má nastavený predmet na %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Miestnosť práve zobrazuje nedostupného člena"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "Miestnosť práve zobrazuje nedostupného člena"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávanie miestnosti je teraz povolené"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávanie miestnosti je teraz zakázané"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Miestnosť je teraz neanonymná"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Miestnosť je teraz poloanonymná"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Miestnosť je teraz anonymná"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Zaznamenávanie miestosti je povolené"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Bola vytvorená nová miestnosť"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s bol vykopnutý %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s bol zakázaný %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy ako %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s bol odstránený z miestnosti (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "príslušnosť zmenená"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "nastavenie miestnosti sa zmenilo na len členovia"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "vypnutie systému"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rola %(nick)s bola nastavená na %(role)s kontaktom %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rola %(nick)s bola nastavená na %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ak zatvoríte okno, budete odpojený z tejto diskusnej skupiny."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Môžete dole špecifikovať dôvod:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazujem %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Prenos súborov"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Prenos súborov"
+
+#: gajim/chat_control.py:392
 #, fuzzy
 msgid "Show a list of formattings"
 msgstr "Zobraziť zoznam emotikon (Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Tento kontakt nepodporuje prenos súborov."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskusnej skupiny %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Relácia NEBUDE zaznamenaná"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Táto relácia je šifrovaná"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " a BUDE zaznamenaná"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " a NEBUDE zaznamenaná"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2007,23 +2120,23 @@ msgstr ""
 "Identita vzdialeného kontaktu nie je overená. Pre viac podrobností kliknite "
 "na tlačidlo v tvare štítu."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E šifrovanie zakázané"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Práve ste prijali novú správu od \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Ak zatvoríte túto kartu a máte deaktivovanú históriu, správa bude stratená."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2032,104 +2145,104 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je teraz %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Prenos súborov"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Veľkosť: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Prijať"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Pripojiť"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Vzdialený kontakt zastavil prenos"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Chyba otvárania súboru"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Zlúčené účty"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Diskuné skupiny"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transporty"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Od teraz bude \"%s\" vidieť váš stav."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Ak \"%s\" akceptuje túto požiadavku, budete vidieť jeho alebo jej stav."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizácia bola odstránená"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Odteraz vás \"%s\" uvidí len v stave odhlásený."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG je nepoužitelný"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2137,11 +2250,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Ste v jednej alebo viacerých diskusných skupinách"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2150,37 +2263,37 @@ msgstr ""
 "diskusných skupín. Ste si skutočne istý, že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr ""
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Naozaj ukončiť program Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ste si istý, že chcete ukončiť program Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Vždy zavrieť Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "Prebiehajú u vás prenosy súborov"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2188,16 +2301,16 @@ msgstr ""
 "Správu bude možné prečítať neskôr len vtedy, ak máte povolenú históriu a "
 "kontakt je vo vašom zozname kontaktov."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Musíte si ich prečítať pred odstránením tohoto transportu."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2205,11 +2318,11 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transport bude odstránený"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2218,68 +2331,68 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Chystáte sa zablokovať kontakt. Ste si skutočne istý, že chcete pokračovať?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Premenovať kontakt"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadať novú prezývku pre kontakt %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Premenovať skupinu"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadať nové meno skupiny %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Odstrániť skupinu"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chcete skutočne odstrániť skupinu %s zo zoznamu kontaktov?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 "Tiež odstráni všetky kontakty v tejto skupine z vášho zoznamu kontaktov"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2289,11 +2402,11 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2302,15 +2415,15 @@ msgstr ""
 "Odstránením tohto kontaktu, automaticky odstránite aj autorizáciu, to "
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakt bude odstránený zo zoznamu"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2320,7 +2433,7 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -2328,32 +2441,32 @@ msgstr ""
 "Chystáte sa poslať vlastnú správu o stave. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ ste neviditeľný"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Server nepodporuje ukladanie metakontaktov"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2362,24 +2475,24 @@ msgstr ""
 "Váš server nepodporuje ukladanie informácií metakontaktov. Tak tieto "
 "informácie nebudú uložené pri ďalšom prihlásení."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Neplatná URI súboru:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2387,182 +2500,182 @@ msgstr[0] "Chcete poslať tieto súbory účtu %s:"
 msgstr[1] "Chcete poslať tento súbor účtu %s:"
 msgstr[2] "Chcete poslať tieto súbory účtu %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Poslať %s do %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Poslať súbor kontaktu"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Poslať súbor kontaktu"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Hudba"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "Publikovať umiestnenie"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Nastavovať služby..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maximalizovať všetko"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Poslať sprá_vu skupine"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Všetkým používateľom"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Poz_vať do"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "S_pravovať kontakty"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Upraviť _skupiny"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "O_dstrániť"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "Znovu p_ripojiť"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "O_dpojiť"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_História"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Správca histórie"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Zmeniť správu o stave"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Zobraziť udalosť v zozname"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor rozšírenej konfigurácie"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s konfiguračná chyba"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Chyba databázy"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Čo si prajete vykonať?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Pripájanie"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Preposlať neprečítané správy"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2571,7 +2684,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2579,7 +2692,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2723,16 +2836,16 @@ msgstr "Emotikony zakázané"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Uložiť heslo"
 
@@ -2762,10 +2875,18 @@ msgstr "Odstrániť iba z programu Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?zobrazovaný stav:All"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Len vstúpiť a vystúpiť"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?zobrazovaný stav:None"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Nová diskusná skupina"
@@ -2832,11 +2953,11 @@ msgstr "Nesprávny záznam"
 msgid "Custom port must be a port number."
 msgstr "Vlastný port musí byť číslo portu."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certifikát už v súbore"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Tento certifikát je práve v súbore %s, preto nebude znova pridaný."
@@ -2940,90 +3061,113 @@ msgstr "Zvýraznenie správ v diskusnej skupine"
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tejto diskusnej skupiny"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Člen"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Vlastník"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [blokovaný]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr ""
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Pripojený"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Odpojený"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Stiahnuť"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Nahrať"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Typ: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Prenesené:"
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Nezačal"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Zastavený"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Dokončený"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?stav prenosu:Pozastavené"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr ""
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Prenášanie"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Stav: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?stav prenosu:Pozastavené"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Preč"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Neprítomný"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Odhlásený"
 
@@ -3072,125 +3216,129 @@ msgstr "(Žiadny)"
 msgid "Hidden"
 msgstr "Skryté"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "História konverzácie s %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "História konverzácie"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Chyba disku"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je teraz %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Chyba: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Chyba"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Zmeniť správu o stave"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "použiť účet %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Spravovať záložky"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "v _zozname kontaktov"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Zobraziť _zoznam"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nie je možné nahrať idle modul"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "nové@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nové%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Názov _hostiteľa:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Vlastnosti servera"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Server odpovedal: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3348,7 +3496,7 @@ msgstr "_Zapísať"
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3356,51 +3504,57 @@ msgstr ""
 "Zatiaľ čo ste nevenovali pozornosť tejto diskusnej skupine, pribudol "
 "nasledujúci text, ktorý je pod čiarou"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Ǔvodzovky"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcie pre \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _slovníku"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chýba \"%s\" a to nie je WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Otvoriť ako _odkaz"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Nesprávne JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3413,30 +3567,35 @@ msgstr[2] "Pred %i dňami"
 msgid "Write a message.."
 msgstr "Nová súkromná správa"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Chystáte sa zavrieť niekoľko kariet"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Naozaj chcete zavrieť všetky?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Diskusné skupiny"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Správy"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3445,110 +3604,110 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Prijať túto požiadavku?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "Overenie HTTP (%(method)s) pre %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Pre prihlásenie do miestnosti %s je potrebné heslo. Zadajte ho, prosím."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Písmo</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Dostali ste ban z diskusnej skupiny %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Diskusná skupina %s neexistuje."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Diskusná skupina %s neexistuje."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Vytváranie diskusných skupín je obmedzené."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Vaša zaregistrovaná prezývka musí byť použitá v diskusnej skupine %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nie ste v zozname členov v skupinovej diskusii %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Požiadavka o zapísanie"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Pozorovatelia"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Kontakt \"%s\" vás autorizoval, aby ste mohol vidieť jeho alebo jej stav."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3557,31 +3716,31 @@ msgstr ""
 "Budete vždy vidieť jeho alebo ju ako neprihlásený.\n"
 "Chcete odstrániť jeho alebo ju zo zoznamu kontaktov?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Nezapísaný"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3590,112 +3749,117 @@ msgstr ""
 "Nastavili ste Gajim aby používal GPG agenta, ale tu nie je žiadny spustený "
 "GPG agent alebo vrátil nesprávne heslo.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Nesprávna passfráza"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Nesprávna passfráza"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikát vypršal"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Prenos súborov"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Vyberte súbor na odoslanie..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Nepodarilo sa dešifrovať správu"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Konflikt používateľských mien"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Konflikt zdroju"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3703,20 +3867,20 @@ msgstr ""
 "Práve ste pripojený k tomuto účtu s rovnakými zdrojmi. Zadajte, prosím, nový "
 "zdroj"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce začať hlasový rozhovor."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Požiadavka na hlasový rozhovor"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Chyba overovania SSL certifikátu"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3729,7 +3893,7 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3742,15 +3906,15 @@ msgstr ""
 "SHA1 fingerprint certifikátu:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3771,7 +3935,7 @@ msgstr ""
 "\n"
 "Chcete sa predsa len pripojiť a aktualizovať odtlačok certifikátu?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3779,7 +3943,7 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
 "tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3788,23 +3952,23 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Ste si istý, "
 "že to chcete urobiť?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Toto nie je diskusná skupina"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Emotikony zakázané"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 "Vami nastavená téma emotikôn nebola nájdená, takže emotikony budú zakázané."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3812,11 +3976,11 @@ msgid ""
 msgstr ""
 "Vami nastavená téma emotikôn nebola nájdená, takže emotikony budú zakázané."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Toto nie je diskusná skupina"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3824,41 +3988,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "predvolená"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG kľúč vypršal"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Váš GPG kľúč vypršal, a preto budete pripojený do %s bez OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
@@ -3930,6 +4094,11 @@ msgstr "- správy budú zaznamenané"
 msgid "- messages will not be logged"
 msgstr "- správy nebudú zaznamenané"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3961,7 +4130,7 @@ msgstr "Neplatná miestnosť"
 msgid "The form is not filled correctly."
 msgstr "Prezývka obsahuje nepovolené znaky."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Neviditeľný"
 
@@ -4095,6 +4264,56 @@ msgstr ""
 "%s\n"
 "Link-local správy nemusia správne fungovať."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Nie je možné spustiť lokálnu službu"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nie je možné načítať obrázok"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Služba vrátila chybu"
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Nie je možné načítať obrázok"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Pripojenie nie je dostupné"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Téma"
@@ -4120,7 +4339,17 @@ msgstr "Nemôžete odstrániť súčastnú tému"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Zlúčené účty"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Použit G_PG agenta"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
@@ -4144,6 +4373,11 @@ msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "O_dstrániť"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4337,51 +4571,65 @@ msgstr "Zmeniť heslo"
 msgid "Login Options"
 msgstr "_Emotikony:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus nie je prítomný na tomto stroji alebo chýba modul pre python"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Zobrazí pomocníka pre daný príkaz"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "príkaz"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "ukáž pomocníka pre príkaz"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Zobraziť alebo skryť okno so zoznamom"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Vypíše zoznam všetkých kontaktov v zozname kontaktov. Každý kontakt sa "
 "zobrazí na novom riadku"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "účet"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "zobraziť len kontakty daného účtu"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše zoznam registrovaných účtov"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Zmeniť stav účtu alebo účtov"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "stav"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4390,11 +4638,17 @@ msgstr ""
 "jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
 "neviditeľný"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "správa"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "správa o stave"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4402,16 +4656,21 @@ msgstr ""
 "zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
 "účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Zmení prioritu účtu alebo účtov"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "priorita"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "priorita, ktorú chcete udeliť účtu"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4420,7 +4679,7 @@ msgstr ""
 "zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
 "účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4430,30 +4689,30 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "obsah správy"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ak je špecifikovaný, správa bude zašifrovaná s použitím verejného kľúča"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ak je špecifikovaný, správa bude odoslaná s použitím tohoto účtu"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4463,121 +4722,121 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "predmet"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "predmet správy"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Pošle novú správu diskusnej skupine do ktorej ste sa prihlásili."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Získať podrobné informácie o kontakte"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Získať podrobné informácie o účte"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Názov účtu"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Poslať súbor kontaktu"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "súbor"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ak je špecifikovaný, súbor bude odoslaný s použitím tohto účtom"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Výpis všetkých nastavení a ich hodnôt"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastavuje hodnotu 'kľúča' na 'hodnotu'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "kľúč=hodnota"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'kľúč' je názov vlastnosti, 'hodnota' je hodnota, na ktorú má byť nastavený"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Odstrániť položku predvoľby"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "kľúč"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "názov nastavenia, ktoré má byť zmazané"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuálny stav nastavení programu Gajim do súboru .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ak je špecifikované, kontakt je zobraný zo zoznamu pre tento účet"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vráti aktuálny stav (použije sa globálny, pokiaľ nie je vybraný účet)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Vráti aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
 "účet)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Vráti počet neprečítaných správ"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Odoslať vlastné XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML na odoslanie"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4586,15 +4845,15 @@ msgstr ""
 "Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
 "všetkým účtom"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Zmeniť avatar"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Obrázok, ktorý sa použije"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4603,19 +4862,19 @@ msgstr ""
 "Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
 "všetkým účtom"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Kontrolovať, či je Gajim spustený"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Zobraziť alebo skryť okno ipython"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4624,15 +4883,15 @@ msgstr ""
 "'%s' nie je vo vašom zozname.\n"
 "Prosím, špecifikujte účet, z ktorého odoslať správu."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Vyzerá že Gajim nebeží. Nemôžete tak použiť gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4641,16 +4900,16 @@ msgstr ""
 "Použitie: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s nenájdený"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4661,7 +4920,7 @@ msgstr ""
 "Použitie: %s príkaz [argumenty]\n"
 "Príkaz je jeden z:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4670,7 +4929,7 @@ msgstr ""
 "Príliš veľa argumentov. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4844,11 +5103,6 @@ msgstr "Koniec týždňa"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP účet %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4873,52 +5127,52 @@ msgstr "Miestnosť bola zničená"
 msgid "You can join this room instead: %s"
 msgstr "Môžete sa prihlásiť do tejto miestnosti namiesto: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznáma chyba SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová správa od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová súkromná správa od diskusnej skupiny %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Správa od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmenil stav"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s sa prihlásil"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s sa odhlásil"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Nie je v zozname"
 
@@ -5693,77 +5947,75 @@ msgstr "Povoliť šifrovanie ESessions pre tento účet."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Má Gajim automaticky spúšťať šifrovanú reláciu keď je to možné?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobraziť upozornenie pred použitím štandardnej SSL knižnice."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Medzerami oddelený zoznam ssl chýb, ktoré ignorovať."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5771,21 +6023,21 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim použije vašu IP adresu a proxy definovanú v "
 "premennej file_transfer_proxies na prenos súborov."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5793,185 +6045,195 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim povolí ostatným zistiť operačný systém, ktorý "
 "používate"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vám chce poslať súbor."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anonymná autentifikácia"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anon_ymná autentifikácia"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anon_ymná autentifikácia"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk v ktorom má byť prevádzaná kontrola pravopisu"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spím"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Pracujem"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefonujem"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Telefonujem."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Vonku"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Som vonku a užívam si život."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Prítomný."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Mám čas na rozhovor."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Nie som prítomný."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Nerušiť."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Ahoj!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "zelená"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "človek"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "námornícka"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Pre"
@@ -6050,37 +6312,50 @@ msgstr "Všetky neprečítané správy budú preposlané."
 msgid "Forward unread message then disconnect"
 msgstr "Preposlať neprečítané správy"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Súbor je prázdny"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Súbor neexistuje"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "vytváranie záznamov databáz"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "vytváranie záznamov databáz"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Poslať %s do %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je súbor ale mal byť priečinok"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim bude ukončený"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je priečinok ale mal byť súbor"
@@ -6090,11 +6365,11 @@ msgstr "%s je priečinok ale mal byť súbor"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "azúrová"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -6103,188 +6378,188 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Nepodarilo sa získať problematický certfikát"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Nepodarilo sa získať certifikát CRL"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nepodarilo sa dešifrovať podpis certifikátu"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nepodarilo sa dešifrovať CRL podpis"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Podpísanie certifikátu zlyhalo"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Zlyhanie CRL podpisu"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Certifikát vypršal"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL vypršal"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr ""
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Nepodarilo sa získať lokálny problematický certifikát"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Nepodarilo sa overiť prvý certifikát"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Reťazec certifikátu je príliš dlhý"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr ""
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Neplatný CA certifikát"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certifikát nie je dôverný"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certifikát odmietnutý"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Zlyhalo overenie aplikácie"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Znovu pripojiť manuálne."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s odpovedal zle na požiadavku o registráciu: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytol rozdielny registračný formulár"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server odpovedal: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Pripojenie k proxy zlyhalo"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie je možné pripojiť sa k účtu %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Spojenie s účtom \"%s\" bolo stratené. Zopakuje sa pripájanie."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6293,7 +6568,7 @@ msgstr ""
 "\n"
 "Chyba SSL: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6302,38 +6577,38 @@ msgstr ""
 "\n"
 "Neznáma chyba SSL: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Overenie zlyhalo s \"%s\""
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Poslať kontakt: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Poslať kontakty:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Nie je možné získať, pretože aktuálny stav je: Neviditeľný"
 
@@ -7205,159 +7480,184 @@ msgstr "video vstup"
 msgid "video output"
 msgstr "video výstup"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Nepovolený znak v názve hostiteľa."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Adresa serveru je požadovaná."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v názve účtu."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?stav prenosu:Pozastavené"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "P_reč"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Odhlásený"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?kontakt má stav:Neznámy"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?kontakt má stav:Chyba"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Zápis už máme:Žiadny"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Pre"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Oba"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Vyžiadať (zápis): Žiadny"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Účastníci"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Účastník"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "píše správu..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7365,22 +7665,22 @@ msgstr[0] "%d správ čaká"
 msgstr[1] "%d správa čaká"
 msgstr[2] "%d správy čakajú"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " z miestnosti %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " od používateľa %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " od %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7388,74 +7688,74 @@ msgstr[0] "%d udalostí čaká"
 msgstr[1] "%d udalosť čaká"
 msgstr[2] "%d udalosti čakajú"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Chcem si vás pridať do môjho zoznamu kontaktov."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Vypršal čas nahrávania obrázku"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Obrázok je príliš veľký"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "GPG je nepoužitelný"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Vypršal čas nahrávania obrázku"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Redistračné informácie pre službu %s nedorazili včas"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "správa"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Chcem si vás pridať do môjho zoznamu."
 
@@ -7494,43 +7794,43 @@ msgstr ""
 "Systémová zbernica nie je k dispozícii.\n"
 "Skúste si prečítať %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Prosím skontrolujte, či je nainštalovaný program Avahi alebo Bonjour."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Nie je možné spustiť lokálnu službu"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie je možné použiť port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Prosím skontrolujte, či je spustený program avahi-daemon"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie je možné zmeniť stav účtu \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Vašu správu nie je možné odoslať."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je odhlásený. Vašu správu nie je možné odoslať."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7773,6 +8073,11 @@ msgstr "_Zakázať"
 msgid "_Add to Roster"
 msgstr "_Pridať do zoznamu"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Vykonať príkaz"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8056,11 +8361,11 @@ msgstr "O mne"
 msgid "Con_tinue"
 msgstr "_Pokračovať"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pozastaviť"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Zrušiť"
@@ -8069,31 +8374,31 @@ msgstr "_Zrušiť"
 msgid "_Open Containing Folder"
 msgstr "_Otvoriť priečinok s obsahom"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Prenos súborov"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "zoznam prenosu súborov"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Zoznam aktívnych, dokončených a zastavených prenosov súborov"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Vyč_istiť"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Odstráni dokončené, zrušené a zlyhané prenosy súborov zo zoznamu"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Odstrániť prenos súboru zo zoznamu."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8101,33 +8406,38 @@ msgstr ""
 "Táto akcia odstráni jeden prenos súborov zo zoznamu. Ak je prenos aktívny, "
 "je najskôr zastavený a potom odstránený"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Zrušiť prenos vybraných súborov a odstrániť nekompletné súbory"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 #, fuzzy
 msgid "Cancel file transfer"
 msgstr "Zrušiť prenos vybraných súborov"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Zrušiť prenos vybraných súborov"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Poslať a zatvoriť"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Skrývanie okien"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozorniť ma, keď sa dokončí prenos"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie oznámenie"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Zobraziť zoznam prenosov súborov medzi vami a ostatnými"
 
@@ -8136,7 +8446,7 @@ msgid "Register to"
 msgstr "Registrovaný na"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8167,21 +8477,21 @@ msgstr "Písmo"
 msgid "Clear formatting"
 msgstr "Vymazať formátovanie"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Zobraziť zoznam emotikon (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Vyberte súbor na odoslanie..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Zobraziť zoznam emotikon (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Udalosť"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Udalosť"
@@ -8244,7 +8554,7 @@ msgstr "<b>Písmo</b>"
 msgid "<b>#</b>"
 msgstr "<b>Písmo</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9000,10 +9310,6 @@ msgstr "_Otvoriť..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor rozšírenej konfigurácie</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Pokročilé"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Začať _rozhovor"
@@ -9246,7 +9552,7 @@ msgid "_Open Email Composer"
 msgstr "_Otvoriť tvorbu E-mailu"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Začať rozhovor"
 
@@ -9291,6 +9597,10 @@ msgstr "Predvoľby"
 msgid "Default:"
 msgstr "Predvolené"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Pridať nový kontakt"
@@ -9316,6 +9626,16 @@ msgstr "_Prezývka:"
 msgid "_Group:"
 msgstr "_Skupina:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Používateľské ID:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Prezývka"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9353,6 +9673,11 @@ msgstr ""
 "Musíte byť pripojený k transportu, aby ste mohli\n"
 "pridať kontakt s použitím tohoto protokolu."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Zmeniť správu o stave"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Nálada:</b>"
@@ -9579,10 +9904,9 @@ msgstr "_Vykonať príkaz..."
 msgid "_Verify"
 msgstr "O_veriť"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Účty"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b> informácie)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9609,11 +9933,6 @@ msgstr "Zobraziť len _aktívne kontakty"
 msgid "Show Transports"
 msgstr "Zobraziť trans_porty"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Prenos súborov"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9687,50 +10006,35 @@ msgstr "Minimalizovať pri automatickom pripojení"
 msgid "Pr_int status:"
 msgstr "Vypísať stav:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Popis"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "Sp_ráva o chybe"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Pravdepodobne nie je fatálna, ale mala aj napriek tomu by mala byť oznámená "
 "vývojárom."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Požiadavka o zapísanie"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "Sp_ráva o chybe"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Zakázať"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Akcie"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_torizovať"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
 
@@ -9748,26 +10052,31 @@ msgstr ""
 msgid "Presets"
 msgstr "_Prítomnosť"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Pozvať priateľov!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "Vyberte kontakty, ktoré chcete synchronizovať"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Prosím, zvolte MUC server."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC server"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Poz_vať"
 
@@ -9887,11 +10196,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Upratujem"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10054,6 +10358,16 @@ msgstr "Zobraziť všetky čakajúce _udalosti"
 msgid "Mute Sounds"
 msgstr "Stlmiť zvuky"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Predvoľby"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Koniec"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Pre:"
@@ -10456,14 +10770,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Konfigurácia miestnosti"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
@@ -10589,6 +10895,17 @@ msgid "Plugin manager"
 msgstr "Registrácia zlyhala"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP účet %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Popis"
+
+#~ msgid "_Actions"
+#~ msgstr "_Akcie"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Vyžaduje python-dbus."
 
@@ -10767,12 +11084,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Použitie: /%s, skryje tlačidlá rozhovoru."
 
-#~ msgid "File is empty"
-#~ msgstr "Súbor je prázdny"
-
-#~ msgid "File does not exist"
-#~ msgstr "Súbor neexistuje"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10802,58 +11113,6 @@ msgstr "Registrácia zlyhala"
 #~ msgstr "Vyžaduje python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?stav prenosu:Pozastavené"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?stav prenosu:Pozastavené"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?kontakt má stav:Neznámy"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?kontakt má stav:Chyba"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Zápis už máme:Žiadny"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Vyžiadať (zápis): Žiadny"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?zobrazovaný stav:All"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?zobrazovaný stav:None"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Prítomný"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "účet"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "stav"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "správa"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "priorita"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "miestnosť"
 
@@ -10865,30 +11124,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "?CLI:password"
 #~ msgstr "heslo"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Diskusné skupiny"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Stiahnuť"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Nahrať"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?stav prenosu:Pozastavené"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Klient: Neznámy"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Neznámy"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Čas: Neznámy"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Použiť D-Bus a Notification-Daemon pre zobrazenie oznámení"
 
@@ -11101,9 +11336,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "Choose _Key..."
 #~ msgstr "Vybrať _kľúč..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Použit G_PG agenta"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11232,18 +11464,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML vstup</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filter:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML vstup</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Poslať"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML konzola pre %s"
 
@@ -11599,9 +11819,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESession</b> informácie)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Meno kontaktu"
@@ -12420,9 +12637,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
diff --git a/po/sr.po b/po/sr.po
index 2056ac1b3..64c070e7f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\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"
@@ -23,20 +23,20 @@ msgstr ""
 msgid "Error."
 msgstr "Грешка"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr ""
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -92,70 +92,70 @@ msgstr "Време"
 msgid "Progress"
 msgstr "Напредак"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Име датотеке: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Величина: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Ви"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Пошаљилац: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Примаоц: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сачувано у: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Пренос датотеке завршен"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Отвори садржавајућу фасциклу"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Пренос датотеке прекинут"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Није могуће успоставити везу са другом страном."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Примаоц: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Порука грешке: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -163,126 +163,126 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Одаберите датотеку за слање..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Пошаљи"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Опис:"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Гајим не може приступити овој датотеци"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Није могуће преписати постојећу датотеку \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Датотека са овим именом већ постоји и немате привилегијапреписати је."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Ова датотека већ постоји"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Шта желите да урадите?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "У фасциклу \"%s\" није могуће писање"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Немате привилегија за писање у овој фасцикли"
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Сними датотеку као..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Датотека: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Вам жели послати датотеку:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Слање профила..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Грешка при преносу датотеке"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Неисправна датотека"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Датотека: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Није могуће послати празну датотеку"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Име: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Пошаљилац: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Пауза"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Настави"
 
@@ -442,44 +442,65 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Захтева python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Доступан"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Могућност"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Грешка при читању датотеке:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Грешка при учитавању датотеке"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Екстензија није подржана"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Слику није могуће сачувати у %(type)s формату. Сачувати као %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Сними слику као..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Имам "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Клијент:Непознат"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?ОС:Непознат"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Време:Непознато"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Везаност:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -488,7 +509,7 @@ msgstr ""
 "Овај контакт је заинтересован за информације о Вашем присуству, али Вас не "
 "занимају информације о његовом/њеном присуству."
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -497,13 +518,13 @@ msgstr ""
 "Ви сте заинтересовани за информације о присуству неког контакта, али њега/њу "
 "не занима Ваше присуство"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -511,27 +532,37 @@ msgid ""
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чекате одговор контакта о Вашем захтеву за претплатом"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Нема захтева за претплатом на чекању."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Све датотеке"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Чисти"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Подешавање прокси профила"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -574,13 +605,13 @@ msgid "_New Group Chat"
 msgstr "_Нови групни разговор"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Није на листи контаката"
 
@@ -593,7 +624,7 @@ msgstr "Желео бих Вас додати на моју листу конт�
 msgid "Send Single _Message…"
 msgstr "Пошаљи једну _поруку..."
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Пошаљи кориснички дефинисан статус"
@@ -611,25 +642,25 @@ msgstr "_Управљање транспортима"
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "Преи_менуј"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Одблокирај"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Блокирај"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "_Уклони"
@@ -643,210 +674,230 @@ msgstr "Информације"
 msgid "Send File..."
 msgstr "Пошаљи _датотеку..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Позови контакте"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Додај на листу контаката"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Информације"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Историјат"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Управљање собама"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Промени _тему..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Подеси _собу..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Уништи собу"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Промени _надимак..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Маркирај ову собу"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Глас"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Већ постављене поруке:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "Умањи прозор на затварање"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Изврши наредбу"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Излогуј се"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Придружи се групном разговору"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Додај контакт..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "датотека"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Откривање сервиса"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Пошаљи једну _поруку..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Напредно"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Подешавања"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Синхронизуј"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Конзола"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Админ"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Пошаљи серверску поруку..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Постави поруку дана..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Освежи поруку дана..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Избриши поруку дана"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Нема доступних налога"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Налози"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "порука"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Смајлији:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Није могуће пронаћи дневник историјата базе података"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "ЏИД"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Датум"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Надимак"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Порука"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Тема"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Желите ли почистити базу података? (НЕ ПРЕПОРУЧУЈЕ СЕ АКО ЈЕ ГАЈИМ ПОКРЕНУТ)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -861,100 +912,100 @@ msgstr ""
 "\n"
 "Уколико притисните Да, молимо сачекајте..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Грешка са базом података"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Извожење дневника историјата..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s у %(time)s каже: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Да ли заиста желите да избришете означену поруку?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Да ли заиста желите избрисати дневник разговора означеног контакта?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Услуга не може бити нађена"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Поништи одобравање"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Да ли заиста желите да избришете означену поруку?"
 msgstr[1] "Да ли заиста желите да избришете означене поруке?"
 msgstr[2] "Да ли заиста желите да избришете означене поруке?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Ова операција је неповратна."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Дохватање профила..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Информације контакта"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Формат: ГГГГ-ММ-ДД"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Информације примљене"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Ако нисте на вези, не можете објавити Баше информације"
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Слање профила..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Информације НИСУ објављене"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Публикација vCard неуспела"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -972,10 +1023,10 @@ msgstr "Име контакта: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Џабер ИД: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Опште"
@@ -1063,36 +1114,36 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Неисправан кориснички ИД"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "ИД корисника не сме садржавати ресурс."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Не можете додати себе у Вашу листу контаката."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Контакт је већ у листи"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Контакт је већ у листи контаката."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ИД корисника:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Грешка приликом додавања сервиса. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1100,61 +1151,61 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "GTK+ Џабер клијент"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "ГТК+ верзија:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyГТК верзија:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Тренутни програмери:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Прошли програмери:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Последње, али не и најмање важно, желели бисмо захвалити свим одржаватељима "
 "пакета"
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Речник за језик %s није доступан"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1167,12 +1218,12 @@ msgstr ""
 "\n"
 "Осветљавање лоше написаних речи неће бити у употреби"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Несигурна веза"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1185,310 +1236,334 @@ msgstr ""
 "не препоручује.\n"
 "Да ли сте сигурни да желите да се повежете овако?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, заиста желим да се конектујем несигурном везом"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Не питај ме више"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Неисправан надимак"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Захтев за претплатом"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Захтев претплате на рачун %(account)s од %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Захтев претплате од %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Придружи се групном разговору"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Неисправна соба"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Неисправан надимак"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Молимо Вас направите нову чисту тему са жељеним именом."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Неисправан џабер ИД"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Лош uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Ово није групни разговор"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Име"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Овај налог није повезан на сервер"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не можете се синхронизовати са налогом ако нисте повезани."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Настављени разговор"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Нови групни разговор"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Додај нови контакт"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Без везе није могућа промена лозинке."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Неисправна лозинка"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Морате да унесете лозинку"
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Контакт је на вези"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Нова Порука"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Нова Самостална Порука"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Нова Приватна Порука"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Нови Е-мејл"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Грешка при преносу датотеке"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Пренос датотеке завршен"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Позив на групни разговор"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Контакт променио статус"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Самостална порука користећи налог %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Самостална порука на налогу %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Самостална Порука"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Послате %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Примљене %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Форма %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Није могуће послати поруку за %s, овај џабер ИД није исправан."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Чисти"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Филтер:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML Унос</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Пошаљи"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Тужан"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Измените"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Уклони"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%s</b> жели да <b>%s</b> неке контакте у листу ваших контаката."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Додате"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Измените"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Обриши"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Групе"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s је предложио да вас додам у листу мојих контаката."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1496,7 +1571,7 @@ msgstr[0] "Додај _контакт"
 msgstr[1] "Додај _контакт"
 msgstr[2] "Додај _контакт"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1504,179 +1579,179 @@ msgstr[0] "Уклања контакт са листе"
 msgstr[1] "Уклања контакт са листе"
 msgstr[2] "Уклања контакт са листе"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Подешавања"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 msgid "We received an error: {}"
 msgstr "Примљена је грешка: {}"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Грешка"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Џабер ИД"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Листа приватности <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Листа приватности за %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Листа приватности"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Редослед: %(order)s, акција: %(action)s, тип: %(type)s, вредност: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Редослед: %(order)s, акција: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Измени правило</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додај правило</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Листа приватности за %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Неисправно име листе"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Позвани сте у групни разговор"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Вас је позвао на разговор"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Вас је позвао на групни разговор у собу %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Да ли желите да прихватите ову позивницу?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Одаберите звук"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav Звукови"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Одаберите слику"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Слике"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Одаберите слику"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Све датотеке"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Кад %s постане:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавање посебног обавештења за %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "за налог %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1700,68 +1775,96 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Грешка SSL сертификата"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Преноси датотека"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E енкрипција онемогућена"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s је од сада познат као %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s је тренутно %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Више нисте у групном разговору \"%(room)s\" или је \"%(nick)s\" отишао."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Промена Теме"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Молимо одредите нову тему:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Промена надимка"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Молимо одредите нови надимак који желите да користите:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Неисправан Џабер ИД групног разговора"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Уништавам %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1770,267 +1873,277 @@ msgstr ""
 "Управо ћете заувек уништити ову собу.\n"
 "Можете испод написати разлог:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Можете такође унети и алтернативну локацију:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "и пријављени"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "и НЕпријављени"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Разговор са "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Настављени разговор"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s је поставио тему на %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Соба сада приказује недоступне чланове"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "соба сада не приказује недоступне чланове"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Логовање у соби је сада омогућено"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Логовање у соби је сада онемогућено"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Соба сада више није анонимна"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Соба је сада полу анонимна"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Соба је сада потпуно анонимна"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Логовање собе је омогућено"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Нова соба је направљена"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер Вам је или доделио надимак или променио постојећи"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s је избачен од стране %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s има забрану: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s има забрану од члана %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "везаност измењена"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "конфигурација собе се променила на само-чланови"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "гашење система"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Афилијација %(nick)s је постављена на %(affiliation)s од стране %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Афилијација %(nick)s је постављена на %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s од стране %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s је отишао"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Избацујем %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Можете навести разлог испод:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Забрањујем %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Преноси датотека"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Преноси датотека"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Прикажи листу форматирања"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Овак контакт не подржава пренос датотека."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Успостављање сесије прекинуто"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Сесија НЕЋЕ бити памћена"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Ова сесија је шифрована"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr "и БИЋЕ памћена"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr "и НЕЋЕ бити памћена"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Идентитет другог корисника није потврђен. Кликните на штит за више детаља."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E енкрипција онемогућена"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Вам је управо послао поруку"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2038,7 +2151,7 @@ msgstr ""
 "Ако затворите овај језичак, а историјат разговора није омогућен, ова порука "
 "ће бити изгубљена."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2047,7 +2160,7 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2056,96 +2169,96 @@ msgstr ""
 "Не могу да дешифрујем поруку од контакта %s\n"
 "Можда је промењена."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s је сада %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Преноси датотека"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Величина: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "_Налози"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Придружи се"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Удаљени контакт је прекинуо пренос"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Грешка при отварању датотеке"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Групни разговори"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Преноси"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Ауторизација послата"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Ауторизација уклоњена"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG није употребљив"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2153,11 +2266,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Учествујете у једном или више групних разговора"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2165,38 +2278,38 @@ msgstr ""
 "Промена Вашег статуса у Невидљив ће резултовати  одвезивањем са тих групних "
 "разговора. Јесте ли сигурни да желите ићи на невидљиво?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "десинхронизован"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Стварно затворити Гајим?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Јесте ли сигурни да желите затворити Гајим?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Увек затвори Гајим"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Прекини пренос датотеке"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Имате непрочитаних порука"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2204,16 +2317,16 @@ msgstr ""
 "Поруке ће бити доступне за читање и касније ако имате омогућен историјат и "
 "тај контакт у листи."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Морате их прочитати пре уклањања овог транспорта."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" ће бити уклоњен"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2221,11 +2334,11 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Транспорт ће бити уклоњен"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2234,12 +2347,12 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са ових "
 "транспорта: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете блокирати контакт. Јесте ли сигурни да желите да наставите?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2248,56 +2361,56 @@ msgstr ""
 "Контакт ће вас видети као да нисте на вези и нећете добијати поруке које вам "
 "шаље."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Преименуј контакт"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Преименуј групу"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Унесите ново име за групу %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Уклони групу"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Желите ли уклонити групу %s са листе контаката?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Уједно уклоња и све контакте из ове групе из листе контаката"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Придружи OpenPGP Кључ"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Одаберите кључ за придруживање контакту"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" ће бити уклоњен са Ваше листе контаката"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Управо ћете уклонити \"%(name)s\" (%(jid)s) из ваше листе контаката.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2307,11 +2420,11 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Да ли желите да наставите?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2320,15 +2433,15 @@ msgstr ""
 "Уклањањем овог контакта уједно подразумевано уклањате и одобрење што значи "
 "да ће Вас та особа увек видети као да нисте на вези."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти ће бити уклоњени са Ваше листе контаката"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2338,7 +2451,7 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -2346,7 +2459,7 @@ msgstr ""
 "Управо ћете послати прилагођен статус. Јесте ли сигурни да желите да "
 "наставите?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2355,26 +2468,26 @@ msgstr ""
 "Контакт ће вас привремено видети као %(status)s, али само док не промените "
 "статус. Онда ће видети глобални статус."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Немогуће је приступити групном разговору ако сте невидљиви"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2383,13 +2496,13 @@ msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2399,11 +2512,11 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2411,183 +2524,183 @@ msgstr[0] "Да ли желите послати ову датотеку кон�
 msgstr[1] "Да ли желите послати ове датотеке контакту %s:"
 msgstr[2] "Да ли желите послати ове датотеке контакту %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Пошаљи %s за %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Направи метаконтакте од %s и %s"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Направи метаконтакте од %s и %s"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Објави песму"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Конфигуриши сервисе..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Позо_ви у"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Измени групе"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "У_логуј се поново"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Излогуј се"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Историјат"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Придруживање новом групном разговору"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Измени статусну поруку"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Прикажи догађај у листи контаката"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Напредна измена конфигурације"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Конфигурација собе"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Прикажи св_е догађаје на чекању"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Шта желите да урадите?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Повезивање"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Проследи непрочитане поруке"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2596,7 +2709,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2604,7 +2717,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2750,16 +2863,16 @@ msgstr "Смајлији искључени"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Лозинка захтевана"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
@@ -2791,10 +2904,18 @@ msgstr "Уклони налог само из Гајима"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?испис статуса:Све"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Само ући и напустити"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:None"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Нови групни разговор"
@@ -2858,11 +2979,11 @@ msgstr "Неисправан унос"
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Сертификат је већ у датотеци"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат је већ у датотеци %s, па није поново додат."
@@ -2968,90 +3089,113 @@ msgstr "Бојење Порука Са Групног Разговора"
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s овог групног разговора"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Везаност контакта у групном разоговру:Никаква"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Члан"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Администратор"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Власник"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [умањен]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "На вези"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Ван везе"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Скидање"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Слање"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Тип: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Пренешено: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Није почео"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Заустављен"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Завршен"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?статус преноса:Паузиран"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Застој"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Пренос у току"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Статус: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?статус преноса:Паузиран"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Слободан за разговор"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Одсутан"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Заузет"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Недоступан"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Није на вези"
 
@@ -3100,124 +3244,128 @@ msgstr "(ништа)"
 msgid "Hidden"
 msgstr "Скривен"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Историјат разговора са %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Историјат разговора"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Грешка при упису на диск"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s је тренутно %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Грешка"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус је тренутно: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус је тренутно: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Измени статусну поруку"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "користећи рачун %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Подешавање маркера"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "у _листи контаката"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "_Прикажи листу контаката"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Сакриј овај мени"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Није могуће учитавање модула idle"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Невидљивост није подржана"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Име хоста:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Сервер је одговорио: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3377,7 +3525,7 @@ msgstr "_Претплати се"
 msgid "_Unsubscribe"
 msgstr "_Укини претплату"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3385,51 +3533,57 @@ msgstr ""
 "Текст испод ове линије је оно што је речено од када сте последњи пут\n"
 "обратили пажњу на овај групни разговор"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Цитат"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Акције за налог \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Прочитајте чланак на _Википедији"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Потражи у Речнику"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "УРЛ-у Речника недостаје \"%s\" и није Вики речник"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "УРЛ-у Веб претраге недостаје \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Претражи Веб"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Отвори као _Везу"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Неисправан џабер ИД"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3442,30 +3596,35 @@ msgstr[2] "Јуче"
 msgid "Write a message.."
 msgstr "статусна порука"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Затворићете неколико језичака"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Да ли заиста желите да их све затворите?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Групни разговори"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Приватни Разговори"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Поруке"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3478,109 +3637,109 @@ msgstr ""
 "је тренутно у употреби или је регистрован од стране неког од учесника.\n"
 "Молимо одредите други надимак испод:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Увек користи надимак када постоји конфликт"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Прихватате ли овај захтев?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Прихватате ли овај захтев на налогу %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Ауторизација за %(url)s (ид: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Веза прекинута"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Фонт</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Забрањен Вам је приступ групном разговору <b>%s</b>."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Групни разговор <b>%s</b> не постоји."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Групни разговор <b>%s</b> не постоји."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Стварање групних разговора Вам није дозвољено."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr ""
 "Морате користити Ваш регистровани надимак у групном разговору <b>%s</b>."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Нисте у листи чланова групног разговора %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка приликом слања %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Захтев за претплатом"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Посматрачи"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Ауторизација прихваћена"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" је укинуо претплату на њега"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3589,31 +3748,31 @@ msgstr ""
 "Увек ћете га/је видети као да није на вези.\n"
 "Да ли желите да га/је уклоните са листе контаката?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Укинута претплата"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Контакт са \"%s\" се не може успоставити"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Проверите Вашу конекцију или покушајте касније."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3622,36 +3781,36 @@ msgstr ""
 "Конфигурисали сте Гајим да користи GPG агента, али не постоји GPG агент који "
 "ради или је вратио лошу фразу лозинке.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Тренутно сте повезани без OpenPGP кључа."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Неисправна лозинка"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Неисправна лозинка"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Сертификат је истекао"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Одаберите Ваш OpenPGP кључ"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3660,77 +3819,82 @@ msgstr ""
 "GPG кључ који се користи за шифровање није од поверења. Да ли заиста желите "
 "да шифрујете ову поруку?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Грешка SSL сертификата"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Преноси датотека"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Одаберите датотеку за слање..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Не могу да дешифрујем поруку"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Конфликт корисничког имена"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Конфликт ресурса"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3738,21 +3902,21 @@ msgstr ""
 "Већ сте конектовани на овај налог са истим ресурсем. Молимо Вас, откуцајте "
 "ново име ресурса"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Захтев за преносом датотеке"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при верификацији SSL сертификата"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3763,7 +3927,7 @@ msgstr ""
 "%(error)s\n"
 "Да ли и даље желите да се конектујете на овај сервер?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3778,15 +3942,15 @@ msgstr ""
 "SHA256 отисак овог сертификата:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Игнориши ову грешку за овај сертификат."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3810,7 +3974,7 @@ msgstr ""
 "\n"
 "Да ли и даље желите да се конектујете и освежите отисак овог сертификата?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3818,7 +3982,7 @@ msgstr ""
 "Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
 "PyOpenSSL да спречите ово. Да ли желите да наставите?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3827,33 +3991,33 @@ msgstr ""
 "Управо ћете послати лозинку преко нешифроване везе. Јесте ли сигурни да "
 "желите то да урадите?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Ово није групни разговор"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Смајлији искључени"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Ово није групни разговор"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3861,41 +4025,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "подразумевано"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Лозинка неопходна"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG кључ истекао"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ваш GPG кључ је истекао, бићете повезани са %s без OpenPGP-а."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Неисправна лозинка"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
@@ -3967,6 +4131,11 @@ msgstr "- поруке ће бити логоване"
 msgid "- messages will not be logged"
 msgstr "- поруке неће бити логоване"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3998,7 +4167,7 @@ msgstr "Неисправна соба"
 msgid "The form is not filled correctly."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Невидљив"
 
@@ -4130,6 +4299,56 @@ msgstr ""
 "%s\n"
 "Поруке локалне мреже можда неће радити како треба."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Није могуће покренути локални сервис"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Не могу учитати слику"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Сервис је вратио грешку."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Не могу учитати слику"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Веза није доступна"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Тема"
@@ -4155,7 +4374,17 @@ msgstr "Не можете избрисати Вашу тренутну тему"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Спојени налози"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Користи G_PG агента"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
@@ -4179,6 +4408,11 @@ msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Уклони"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4374,51 +4608,65 @@ msgstr "Измени лозинку"
 msgid "Login Options"
 msgstr "_Смајлији:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus не постоји на овом рачунару или нема python модула."
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Приказује помоћ за одређену наредбу"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "наредба"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "прикажи помоћ за команду"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Приказује или скрива прозор листе контаката "
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Искаче прозор са следећим догађајем на чекању"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Исписује листу свих контаката са листе контаката. Сваки контакт је у "
 "посебној линији"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "налог"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "приказује само контакте са овог налога"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Исписује листу регистрованих налога"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Мења статус једног или више налога"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "статус"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4427,11 +4675,17 @@ msgstr ""
 "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
 "узнемиравај, невидљив"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "порука"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "статусна порука"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4440,16 +4694,21 @@ msgstr ""
 "свих налога који имају укључену опцију \"синхронизација са глобалним статусом"
 "\""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Мења статус једног или више налога"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "приоритет"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "приоритет који желите да дате овом налогу"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4457,7 +4716,7 @@ msgstr ""
 "измена приоритета датог налога. Ако није одређен, мења се статус свих налога "
 "који имају постављену опцију \"синхронизација са глобалним статусом\""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4467,29 +4726,29 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "Џабер ИД контакта који ће примити поруку"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "садржај поруке"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ако је назначено, порука ће бити шифрована користећи овај јавни кључ"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ако је назначено, порука ће бити послата користећи овај налог"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4499,120 +4758,120 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "тема"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "тема поруке"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Шаље нову поруку на групни разговор коме сте се придружили."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "Џабер ИД собе која ће примити поруку"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Даје детаљне информације о контакту"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "Џабер ИД контакта"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Даје детаљне информације о налогу"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Име налога"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Шаље датотеку контакту"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "датотека"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Путања до датотеке"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ако је назначено, датотека ће бити послата коритећи овај налог"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Приказује сва подешавања и њихове вредности"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Поставља вредност 'кључа' на 'вредност'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "кључ=вредност"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'кључ' је име ставке подешавања, 'вредност' је вредност на коју ће се ставка "
 "поставити"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Брише ставку подешавања"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "кључ"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "име ставке подешавања које ће се брисати"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записује тренутно стање Гајим подешавања у .config датотеку"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Уклања контакт са листе"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако је назначено, контакт се узима са листе контаката овог налога"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Враћа тренутни статус (глобални ако није назначен налог)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Враћа број непрочитаних порука"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Шаље кориснички дефинисан XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML за слање"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4621,17 +4880,17 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Измени статус"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Надимак за коришћење"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4640,19 +4899,19 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Молимо проверите да ли је Гајим покренут"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Приказује или скрива ipython прозор"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Недостаје аргумент \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4661,15 +4920,15 @@ msgstr ""
 "'%s' није на Вашј листи.\n"
 "Молимо одредите налог за слање поруке."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "немате активних рачуна"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4678,16 +4937,16 @@ msgstr ""
 "Коришћење: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s није пронађен"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4699,7 +4958,7 @@ msgstr ""
 "  %s наредба [аргументи]\n"
 "Наредба је једна од:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4708,7 +4967,7 @@ msgstr ""
 "Превише аргумената\n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4882,11 +5141,6 @@ msgstr "Крај недеље"
 msgid "Weekend!"
 msgstr "Викенд!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP налог %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4910,52 +5164,52 @@ msgstr "Соба групног разговора је уништена"
 msgid "You can join this room instead: %s"
 msgstr "Можете се прикључити соби %s уместо ове"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Непозната SSL грешка: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нова самостална порука од контакта %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нова приватна порука са групног разговора %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s је променио статус"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s је на вези"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s је отишао"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Није у листи контаката"
 
@@ -5783,22 +6037,18 @@ msgstr "Омогући ESessions енкрипцију за овај налог."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Да ли ће Гајим аутоматски стартовати шифровану сесију ако је могуће?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Уређена листа (одвојена зарезима) типова конекције за пробу. Може садржати "
-"tls, ssl или plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5806,48 +6056,48 @@ msgid ""
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Прикажи прозор упозорења пре коришћења стандардне SSL библиотеке."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Листа ssl грешака за игнорисање, одвојена размацима."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Слање белина после неактивности"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "Слање XMPP пинга после неактивности"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5856,11 +6106,11 @@ msgstr ""
 "Колико секунди чекати на одговор о пакетима о живости пре него што покушамо "
 "поновно успостављање везе."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 привремено решење"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5868,21 +6118,21 @@ msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Одговор на захтев примања"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Послати захтев примања"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5890,12 +6140,12 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s Вам жели послати датотеку."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5903,150 +6153,160 @@ msgstr ""
 "Када се успоставља шифрована сесија, да ли Гајим треба да претпостави да "
 "желите да чувате поруке у дневнику?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Анонимно пријављивање"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Анон_имно пријављивање"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Анон_имно пријављивање"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Језик у коме желите проверавати неисправно написане речи"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr "Колико линија тражити од сервера при уласку на групни разговор."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr "Од пре колико минута тражити дневнике при уласку на групни разговор."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Једем"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Једем, оставите поруку."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Филм"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Радим."
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Радим."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Напољу"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6055,27 +6315,27 @@ msgstr ""
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "зелена"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "намирнице"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "људска"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "морска"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "За"
@@ -6154,37 +6414,50 @@ msgstr "Све непрочитане поруке су прослеђене."
 msgid "Forward unread message then disconnect"
 msgstr "Проследи непрочитане поруке"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Датотека је празна"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Датотека не постоји"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "креирам базу дневника"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "креирам базу дневника"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Пошаљи %s за %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s је датотека, али би требала бити фасцикла"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Гајим ће се сада завршити"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jе фасцикла, али би требала бити датотека"
@@ -6194,11 +6467,11 @@ msgstr "%s jе фасцикла, али би требала бити датот�
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: није могуће отворити %s за читање"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "цијан"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "пребацујем базу дневника у индексе"
 
@@ -6207,188 +6480,188 @@ msgstr "пребацујем базу дневника у индексе"
 msgid "%s is not a valid loglevel"
 msgstr "%s није исправан ниво логовања"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Нисам успео да узмем сертификат издавача"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Нисам успео да узмем CRL сертификата"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Нисам успео да дешифрујем потпис сертификата"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Нисам успео да дешифрујем CRL сертификата"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Нисам успео да декодирам јавни кључ издавача"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Грешка у потпису сертификата"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Грешка у CRL сертификата"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Сертификат још није валидан"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Сертификат је истекао"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL није још валидан"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL је истекао"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка у формату сертифаковог поља од када је валидан"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка у формату сертифаковог поља до када је валидан"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Грешка у формату CRL-овогпоља последњег ажурирања"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Грешка у формату CRL-овогпоља следећег ажурирања"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Немам више меморије"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Самопотписани сертификат"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопотписани сертификат у ланцу сертификата"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "У немогућности да узмем сертификат локалног издавача"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "У немогућности да верификујем први сертификат"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Ланац сертификата предугачак"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Сертификат повучен"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Неисправан сертификат сертификационог тела (CA)"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Прекорачена дужина путање"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Неподржана сврха сертификата"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Сертификату се не верује"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Сертификат одбачен"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Погрешна тема издавача сертификата"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификатор кључа ауторизатора и теме се не поклапају"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серијски број ауторизатора и издавача се не поклапају"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Употреба кључа не укључује потписивање сертификата"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Изгубљена веза са рачуном \"%s\""
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Поново се повежите ручно."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s је лоше одговорио на захтев регистрације:: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s је понудио другачију форму за регистрацију"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Веза са \"%(host)s\" преко проксија \"%(proxy)s\" није могућа"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Веза са \"%s\" није могућа"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер је одговорио: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Веза са проксијем прекинута"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Веза са %s није могућа"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Изгубљена веза са налогом %s. Покушајте поново да се конектујете."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6397,7 +6670,7 @@ msgstr ""
 "\n"
 "SSL грешка: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6406,7 +6679,7 @@ msgstr ""
 "\n"
 "Непозната SSL грешка: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -6415,31 +6688,31 @@ msgstr ""
 "Аутентичност сертификата %s може бити неисправна.\n"
 "Сертификат не покрива овај домен."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Веза са \"%s\" није могућа"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Пријављивање са \"%s\" неуспешно"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Молимо Вас да проверите Ваше корисничко име и лозинку од грешака."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Послати контакти: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Послати контакти:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Није дохваћено због статуса невидљивости"
 
@@ -7309,159 +7582,184 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Неисправан карактер у имену хоста."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Потребна је адреса сервера."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Неисправан карактер у корисничком имену."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Неисправан карактер у ресурсу."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Заузет"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Недоступан"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Слободан за разговор"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?статус преноса:Паузиран"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Повезивање"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "О_дсутан"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Није на вези"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Невидљив"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?контакт има статус:Непознат"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?контакт има статус:Постоје грешке"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Тренутна претплата:Ниједна"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "За"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Од"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Обоје"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Питај (за претплату):Ниједна"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Претплатите се"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Улога контакта у групном разговору:Никаква"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Модератори"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Учесници"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Учесник"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Посетилац"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "слуша конверзацију"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "ради нешто друго"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "пише поруку..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "пауза при писању поруке"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7469,22 +7767,22 @@ msgstr[0] "%d порука чека"
 msgstr[1] "%d порука чекају"
 msgstr[2] "%d порука чека"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " из собе %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " од корисника %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " од %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7492,74 +7790,74 @@ msgstr[0] "%d догађај на чекању"
 msgstr[1] "%d догађаја на чекању"
 msgstr[2] "%d догађај на чекању"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Гајим"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Гајим - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Желио бих да Вас додам на листу мојих контаката."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Истекло време за учитавање слике"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Слика је превелика"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL није још валидан"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Истекло време за учитавање слике"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информације о регистрацији за транспорт %s нису дошле на време"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "порука"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Желео бих да те додам на моју листу контаката."
 
@@ -7598,43 +7896,43 @@ msgstr ""
 "Линија сесије није доступна.\n"
 "Прочитајте http:/trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Није могуће покренути локални сервис"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не могу се повезати на порт %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Молимо проверите да ли је avahi-демон покренут."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Није могуће променити статус рачуна \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Ваша порука није могла бити послата."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт није на вези. Вашу поруку није могуће послати."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7876,6 +8174,11 @@ msgstr "_Забрани"
 msgid "_Add to Roster"
 msgstr "_Додај на листу контаката"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Изврши наредбу"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8159,11 +8462,11 @@ msgstr "О"
 msgid "Con_tinue"
 msgstr "_Настави"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Паузирај"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Одустани"
@@ -8172,31 +8475,31 @@ msgstr "_Одустани"
 msgid "_Open Containing Folder"
 msgstr "_Отвори садржавајућу фасциклу"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Преноси датотека"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "листа преноса датотека"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Листа преноса активних, завршених и заустављених датотека"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Почисти"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Уклони завршене, прекинуте и неуспеле преносе датотека из листе"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Уклони пренос датотека са листе"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8204,32 +8507,37 @@ msgstr ""
 "Ова акција уклања пренос датотеке са листе. Ако је пренос активан, прво се "
 "зауставља, па онда уклања"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Прекини пренос означене датотеке и избриши недовршену датотеку"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Прекини пренос датотеке"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Прекини пренос означене датотеке"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Пошаљи и затвори"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Сакрива прозор"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Обавести ме када се заврши пренос датотеке"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Прикажи искачуће обавештење када се заврши пренос датотеке"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Приказује листу преноса датотека између Вас и осталих"
 
@@ -8238,7 +8546,7 @@ msgid "Register to"
 msgstr "Региструј се на"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_У реду"
 
@@ -8269,21 +8577,21 @@ msgstr "Фонт"
 msgid "Clear formatting"
 msgstr "Очисти форматирање"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Прикажи листу смајлија (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Шифровање лозинком"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Прикажи листу смајлија (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "догађај"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "догађај"
@@ -8346,7 +8654,7 @@ msgstr "<b>Фонт</b>"
 msgid "<b>#</b>"
 msgstr "<b>Фонт</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9104,10 +9412,6 @@ msgstr "_Отвори..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Напредна измена конфигурације</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Напредно"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Започни ра_зговор"
@@ -9349,7 +9653,7 @@ msgid "_Open Email Composer"
 msgstr "_Отвори састављач е-мејла"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Започни разговор"
 
@@ -9394,6 +9698,10 @@ msgstr "Подешавања"
 msgid "Default:"
 msgstr "Подразумевано"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Додај нови контакт"
@@ -9419,6 +9727,16 @@ msgstr "_Надимак:"
 msgid "_Group:"
 msgstr "_Група:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ИД корисника:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Надимак"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9457,6 +9775,11 @@ msgstr ""
 "Морате бити повезани на транспорт да бисте могли\n"
 "додавати контакте са овог протокола."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Измени статусну поруку"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Расположење:</b>"
@@ -9681,10 +10004,10 @@ msgstr "_Изврши наредбу..."
 msgid "_Verify"
 msgstr "_Потврди"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Налози"
+#: gajim/data/gui/esession_info_window.ui:137
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>Опис</b>"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9711,11 +10034,6 @@ msgstr "Прикажи само _активне контакте"
 msgid "Show Transports"
 msgstr "Прикажи транс_порте"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Преноси датотека"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9789,46 +10107,31 @@ msgstr "Умањи прозор на ауто повезивање"
 msgid "Pr_int status:"
 msgstr "Испис статуса:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Опис"
-
-#: gajim/data/gui/exception_dialog.ui:44
-msgid "Report Bug"
-msgstr ""
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Захтев за претплатом"
+#: gajim/data/gui/exception_dialog.ui:115
+msgid "Report Bug"
+msgstr ""
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Одбиј"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Одбиј ауторизацију тако да не може да види када сте на вези"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Акције"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Одобри ауторизацију"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Одобри ауторизацију контакта тако да може да види када сте на вези"
 
@@ -9846,11 +10149,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Присутност"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Позови пријатеље!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9859,15 +10162,20 @@ msgstr ""
 "Започећете групни разговор.\n"
 "Одаберите контакте које желите да позовете"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Молимо одаберите сервер групног разговора."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Сервер групног разговора"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Позо_ви"
 
@@ -9986,11 +10294,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Чисти"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10153,6 +10456,15 @@ msgstr "Прикажи св_е догађаје на чекању"
 msgid "Mute Sounds"
 msgstr "Угаси звукове"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Подешавања"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr ""
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "За:"
@@ -10552,14 +10864,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Конфигурација собе"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Џабер IM Клијент"
@@ -10684,6 +10988,30 @@ msgid "Plugin manager"
 msgstr "Регистрација неуспела"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP налог %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Опис"
+
+#, fuzzy
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr "<b>%s</b> жели да <b>%s</b> неке контакте у листу ваших контаката."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Уређена листа (одвојена зарезима) типова конекције за пробу. Може "
+#~ "садржати tls, ssl или plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Акције"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Захтева python-dbus."
 
@@ -10884,12 +11212,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Начин коришћења: /%s, сакрива дугмад."
 
-#~ msgid "File is empty"
-#~ msgstr "Датотека је празна"
-
-#~ msgid "File does not exist"
-#~ msgstr "Датотека не постоји"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10919,58 +11241,6 @@ msgstr "Регистрација неуспела"
 #~ msgstr "Захтева python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?статус преноса:Паузиран"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?статус преноса:Паузиран"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?контакт има статус:Непознат"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?контакт има статус:Постоје грешке"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Тренутна претплата:Ниједна"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Питај (за претплату):Ниједна"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Улога контакта у групном разговору:Никаква"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Везаност контакта у групном разоговру:Никаква"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?испис статуса:Све"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:None"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Доступан"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "налог"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "статус"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "порука"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "приоритет"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "соба"
 
@@ -10982,30 +11252,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "?CLI:password"
 #~ msgstr "лозинка"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Групни разговори"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Скидање"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Слање"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?статус преноса:Паузиран"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Клијент:Непознат"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?ОС:Непознат"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Време:Непознато"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Користи ДБус и демон обавештења за приказивање обавештења"
 
@@ -11198,9 +11444,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "Choose _Key..."
 #~ msgstr "Одаберите _Кључ"
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Користи G_PG агента"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr "Ако је означено, Гајим ће узети лозинку од GPG агента"
@@ -11327,18 +11570,6 @@ msgstr "Регистрација неуспела"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML Унос</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Филтер:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML Унос</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Пошаљи"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML Конзола за %s"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 686f5c739..78a1506d6 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-10-29 23:50+0100\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
@@ -29,20 +29,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Greška."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Stvarno pošalji datoteku?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -99,70 +99,70 @@ msgstr "Vreme"
 msgid "Progress"
 msgstr "Napredak"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Veličina: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Vi"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošaljilac: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Primaoc: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sačuvano u: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Prenos datoteke završen"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Otvori sadržavajuću fasciklu"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke prekinut"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primaoc: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka greške: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -170,126 +170,126 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Odaberite datoteku za slanje..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Pošalji"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Opis:"
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Datoteka sa ovim imenom već postoji i nemate privilegijaprepisati je."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Šta želite da uradite?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U fasciklu \"%s\" nije moguće pisanje"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate privilegija za pisanje u ovoj fascikli"
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Snimi datoteku kao..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Tip: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vam želi poslati datoteku:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Slanje profila..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Greška pri prenosu datoteke"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/sek)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Neispravna datoteka"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Datoteka: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Ime: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Pošaljilac: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Pauza"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Nastavi"
 
@@ -449,44 +449,65 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Zahteva python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Dostupan"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Mogućnost"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Greška pri učitavanju datoteke"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Ekstenzija nije podržana"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Sliku nije moguće sačuvati u %(type)s formatu. Sačuvati kao %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Snimi sliku kao..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Imam "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Klijent:Nepoznat"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Nepoznat"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Vreme:Nepoznato"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vezanost:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -495,7 +516,7 @@ msgstr ""
 "Ovaj kontakt je zainteresovan za informacije o Vašem prisustvu, ali Vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu."
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -504,13 +525,13 @@ msgstr ""
 "Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
 "nju ne zanima Vaše prisustvo"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "I Vi i Vaš kontakt ste zainteresovani za informacije o prisustvu jedan drugog"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -518,27 +539,37 @@ msgid ""
 msgstr ""
 "I Vi i Vaš kontakt ste zainteresovani za informacije o prisustvu jedan drugog"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Nema zahteva za pretplatom na čekanju."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Sve datoteke"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Čisti"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Podešavanje proksi profila"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -581,13 +612,13 @@ msgid "_New Group Chat"
 msgstr "_Novi grupni razgovor"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Nije na listi kontakata"
 
@@ -600,7 +631,7 @@ msgstr "Želeo bih Vas dodati na moju listu kontakata"
 msgid "Send Single _Message…"
 msgstr "Pošalji _jednu poruku"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Pošalji korisnički definisan status"
@@ -618,25 +649,25 @@ msgstr "_Upravljanje transportima"
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Preimenuj"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Odblokiraj"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "_Ukloni"
@@ -650,210 +681,230 @@ msgstr "Informacije"
 msgid "Send File..."
 msgstr "Pošalji _datoteku..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Pozovi kontakte"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Dodaj na listu kontakata"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "Informacije"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Istorijat"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Upravljanje sobama"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Promeni _temu..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Podesi _sobu..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Uništi sobu"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Promeni _nadimak..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Markiraj ovu sobu"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Glas"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Već postavljene poruke:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "Umanji prozor na zatvaranje"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Izvrši naredbu"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Izloguj se"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Dodaj kontakt..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "datoteka"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Otkrivanje servisa"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Pošalji jednu _poruku..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Napredno"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Podešavanja"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Sinhronizuj"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Admin"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Pošalji serversku poruku..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Postavi poruku dana..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Osveži poruku dana..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Izbriši poruku dana"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Nema dostupnih naloga"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Nalozi"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "poruka"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Smajliji:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći dnevnik istorijata baze podataka"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "DŽID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Poruka"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Tema"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Želite li počistiti bazu podataka? (NE PREPORUČUJE SE AKO JE GAJIM POKRENUT)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -868,100 +919,100 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, molimo sačekajte..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Greška sa bazom podataka"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Izvoženje dnevnika istorijata..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s u %(time)s kaže: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Da li zaista želite da izbrišete označenu poruku?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Da li zaista želite izbrisati dnevnik razgovora označenog kontakta?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Usluga ne može biti nađena"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Poništi odobravanje"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Da li zaista želite da izbrišete označenu poruku?"
 msgstr[1] "Da li zaista želite da izbrišete označene poruke?"
 msgstr[2] "Da li zaista želite da izbrišete označene poruke?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Ova operacija je nepovratna."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Dohvatanje profila..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Informacije kontakta"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: GGGG-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Informacije primljene"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Ako niste na vezi, ne možete objaviti Baše informacije"
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Slanje profila..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Publikacija vCard neuspela"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -979,10 +1030,10 @@ msgstr "Ime kontakta: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Džaber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Opšte"
@@ -1069,36 +1120,36 @@ msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati na nalog %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Neispravan korisnički ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakt je već u listi"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je već u listi kontakata."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "ID korisnika:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Greška prilikom dodavanja servisa. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1106,61 +1157,61 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "GTK+ Džaber klijent"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ verzija:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK verzija:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Trenutni programeri:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Prošli programeri:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Poslednje, ali ne i najmanje važno, želeli bismo zahvaliti svim "
 "održavateljima paketa"
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1173,12 +1224,12 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Nesigurna veza"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1189,310 +1240,334 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Zahtev za pretplatom"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtev pretplate na račun %(account)s od %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtev pretplate od %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Neispravna soba"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Neispravan nadimak"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Molimo Vas napravite novu čistu temu sa željenim imenom."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Neispravan džaber ID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Loš uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Ovo nije grupni razgovor"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Ime"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete se sinhronizovati sa nalogom ako niste povezani."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Nastavljeni razgovor"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Novi grupni razgovor"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Dodaj novi kontakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promena lozinke."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Morate da unesete lozinku"
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakt je na vezi"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nova Poruka"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nova Samostalna Poruka"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Poziv na grupni razgovor"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakt promenio status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Nije moguće poslati poruku za %s, ovaj džaber ID nije ispravan."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Čisti"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filter:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML Unos</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Pošalji"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Tužan"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Izmenite"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "_Ukloni"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%s</b> želi da <b>%s</b> neke kontakte u listu vaših kontakata."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Dodate"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Izmenite"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Obriši"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Grupe"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s je predložio da vas dodam u listu mojih kontakata."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1500,7 +1575,7 @@ msgstr[0] "Dodaj _kontakt"
 msgstr[1] "Dodaj _kontakt"
 msgstr[2] "Dodaj _kontakt"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1508,180 +1583,180 @@ msgstr[0] "Uklanja kontakt sa liste"
 msgstr[1] "Uklanja kontakt sa liste"
 msgstr[2] "Uklanja kontakt sa liste"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Podešavanja"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Servis je vratio grešku."
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Greška"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Džaber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privatnosti <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Lista privatnosti"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Redosled: %(order)s, akcija: %(action)s, tip: %(type)s, vrednost: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosled: %(order)s, akcija: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmeni pravilo</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privatnosti za %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Neispravno ime liste"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vas je pozvao na grupni razgovor u sobu %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Odaberite zvuk"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Odaberite sliku"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Slike"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Odaberite sliku"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Sve datoteke"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje posebnog obaveštenja za %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "za nalog %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1705,68 +1780,96 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Greška SSL sertifikata"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Prenosi datoteka"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E enkripcija onemogućena"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Više niste u grupnom razgovoru \"%(room)s\" ili je \"%(nick)s\" otišao."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Promena Teme"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Molimo odredite novu temu:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Promena nadimka"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo odredite novi nadimak koji želite da koristite:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1775,268 +1878,278 @@ msgstr ""
 "Upravo ćete zauvek uništiti ovu sobu.\n"
 "Možete ispod napisati razlog:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "i prijavljeni"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "i NEprijavljeni"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s šifrovanje %(status)s aktivan %(authenticated)s.\n"
 "Vaša sesija razgovora %(logged)s biti pamćena."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Soba sada prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "soba sada ne prikazuje nedostupne članove"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Logovanje u sobi je sada omogućeno"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Logovanje u sobi je sada onemogućeno"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Soba sada više nije anonimna"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada polu anonimna"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Soba je sada potpuno anonimna"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Logovanje sobe je omogućeno"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Nova soba je napravljena"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Server Vam je ili dodelio nadimak ili promenio postojeći"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranu od člana %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s je izbačen iz sobe (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "gašenje sistema"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Afilijacija %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Afilijacija %(nick)s je postavljena na %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s je otišao"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, bićete isključeni sa ovoh grupnog razgovora."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Prenosi datoteka"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Prenosi datoteka"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Prikaži listu formatiranja"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Ovak kontakt ne podržava prenos datoteka."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Uspostavljanje sesije prekinuto"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sesija NEĆE biti pamćena"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Ova sesija je šifrovana"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr "i BIĆE pamćena"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti pamćena"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Identitet drugog korisnika nije potvrđen. Kliknite na štit za više detalja."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2044,7 +2157,7 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2053,7 +2166,7 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2062,96 +2175,96 @@ msgstr ""
 "Ne mogu da dešifrujem poruku od kontakta %s\n"
 "Možda je promenjena."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je sada %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Prenosi datoteka"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Veličina: %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "_Nalozi"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Udaljeni kontakt je prekinuo prenos"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Greška pri otvaranju datoteke"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Grupni razgovori"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Prenosi"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Autorizacija poslata"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako kontakt \"%s\" prihvati ovaj zahtev, znaćete njegov/njen status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Autorizacija uklonjena"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će Vas kontakt \"%s\" uvek videti kao da niste na vezi."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2159,11 +2272,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2171,38 +2284,38 @@ msgstr ""
 "Promena Vašeg statusa u Nevidljiv će rezultovati  odvezivanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "desinhronizovan"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Stvarno zatvoriti Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Uvek zatvori Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Prekini prenos datoteke"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2210,16 +2323,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2227,11 +2340,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2240,12 +2353,12 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovih "
 "transporta: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete blokirati kontakt. Jeste li sigurni da želite da nastavite?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2254,56 +2367,56 @@ msgstr ""
 "Kontakt će vas videti kao da niste na vezi i nećete dobijati poruke koje vam "
 "šalje."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno uklonja i sve kontakte iz ove grupe iz liste kontakata"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Pridruži OpenPGP Ključ"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za pridruživanje kontaktu"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" će biti uklonjen sa Vaše liste kontakata"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Upravo ćete ukloniti \"%(name)s\" (%(jid)s) iz vaše liste kontakata.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2313,11 +2426,11 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2326,15 +2439,15 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno podrazumevano uklanjate i odobrenje što "
 "znači da će Vas ta osoba uvek videti kao da niste na vezi."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status i nakon uklanjanja"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2344,7 +2457,7 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -2352,7 +2465,7 @@ msgstr ""
 "Upravo ćete poslati prilagođen status. Jeste li sigurni da želite da "
 "nastavite?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2361,26 +2474,26 @@ msgstr ""
 "Kontakt će vas privremeno videti kao %(status)s, ali samo dok ne promenite "
 "status. Onda će videti globalni status."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate kreirati nalog pre nego što možete da razgovarate sa ostalim "
 "kontaktima."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2389,13 +2502,13 @@ msgstr ""
 "Vaš server ne podržava čuvanje informacija pseudokontakata. Te informacije "
 "neće biti sačuvane pri sledećem povezivanju."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2405,11 +2518,11 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2417,183 +2530,183 @@ msgstr[0] "Da li želite poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Da li želite poslati ove datoteke kontaktu %s:"
 msgstr[2] "Da li želite poslati ove datoteke kontaktu %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Pošalji %s za %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Napravi metakontakte od %s i %s"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Napravi metakontakte od %s i %s"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Objavi pesmu"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Konfiguriši servise..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Izmeni _grupe"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "U_loguj se ponovo"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Izloguj se"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Istorijat"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Izmeni statusnu poruku"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Prikaži događaj u listi kontakata"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Napredna izmena konfiguracije"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Konfiguracija sobe"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Prikaži sv_e događaje na čekanju"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Šta želite da uradite?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Povezivanje"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Prosledi nepročitane poruke"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2602,7 +2715,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2610,7 +2723,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2756,16 +2869,16 @@ msgstr "Smajliji isključeni"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
@@ -2797,10 +2910,18 @@ msgstr "Ukloni nalog samo iz Gajima"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?ispis statusa:Sve"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Samo ući i napustiti"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:None"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Novi grupni razgovor"
@@ -2866,11 +2987,11 @@ msgstr "Neispravan unos"
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Sertifikat je već u datoteci %s, pa nije ponovo dodat."
@@ -2974,90 +3095,113 @@ msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Član"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administrator"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [blokiran]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [umanjen]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Na vezi"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Van veze"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Skidanje"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Slanje"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Tip: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Nije počeo"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Zaustavljen"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Završen"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?status prenosa:Pauziran"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Zastoj"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Prenos u toku"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?status prenosa:Pauziran"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Odsutan"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Zauzet"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Nije na vezi"
 
@@ -3106,125 +3250,129 @@ msgstr "(ništa)"
 msgid "Hidden"
 msgstr "Skriven"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istorijat razgovora sa %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Istorijat razgovora"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Greška pri upisu na disk"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Greška"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Izmeni statusnu poruku"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Podešavanje markera"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "u _listi kontakata"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "_Prikaži listu kontakata"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Nije moguće učitavanje modula idle"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Nevidljivost nije podržana"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Ime hosta:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Mogućnosti servera"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Server je odgovorio: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3384,7 +3532,7 @@ msgstr "_Pretplati se"
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3392,51 +3540,57 @@ msgstr ""
 "Tekst ispod ove linije je ono što je rečeno od kada ste poslednji put\n"
 "obratili pažnju na ovaj grupni razgovor"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Citat"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za nalog \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Vikipediji"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Potraži u Rečniku"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u Rečnika nedostaje \"%s\" i nije Viki rečnik"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Veb pretrage nedostaje \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Pretraži Veb"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Otvori kao _Vezu"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Neispravan džaber ID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3449,30 +3603,35 @@ msgstr[2] "Juče"
 msgid "Write a message.."
 msgstr "Nova Privatna Poruka"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Zatvorićete nekoliko jezičaka"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Da li zaista želite da ih sve zatvorite?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Grupni razgovori"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Poruke"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3484,108 +3643,108 @@ msgstr ""
 "registrovan od strane nekog od učesnika.\n"
 "Molimo odredite drugi nadimak ispod:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Uvek koristi nadimak kada postoji konflikt"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Prihvatate li ovaj zahtev?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Lozinka potrebna za pridruživanje grupnom razgovoru %s. Unesite je."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Font</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Zahtev za pretplatom"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" je prihvatio da vidite njegov/njen status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3594,31 +3753,31 @@ msgstr ""
 "Uvek ćete ga/je videti kao da nije na vezi.\n"
 "Da li želite da ga/je uklonite sa liste kontakata?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Ukinuta pretplata"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3627,36 +3786,36 @@ msgstr ""
 "Konfigurisali ste Gajim da koristi GPG agenta, ali ne postoji GPG agent koji "
 "radi ili je vratio lošu frazu lozinke.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste povezani bez OpenPGP ključa."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Neispravna lozinka"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Neispravna lozinka"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Sertifikat je istekao"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Odaberite Vaš OpenPGP ključ"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3665,77 +3824,82 @@ msgstr ""
 "GPG ključ koji se koristi za šifrovanje nije od poverenja. Da li zaista "
 "želite da šifrujete ovu poruku?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Greška SSL sertifikata"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Prenosi datoteka"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspešno ste poslali datoteku %(filename)s za kontakt %(name)s"
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Odaberite datoteku za slanje..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Ne mogu da dešifrujem poruku"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Konflikt resursa"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3743,21 +3907,21 @@ msgstr ""
 "Već ste konektovani na ovaj nalog sa istim resursem. Molimo Vas, otkucajte "
 "novo ime resursa"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Greška pri verifikaciji SSL sertifikata"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3768,7 +3932,7 @@ msgstr ""
 "servera:%(error)s\n"
 "Da li i dalje želite da se konektujete na ovaj server?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3781,15 +3945,15 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3810,7 +3974,7 @@ msgstr ""
 "\n"
 "Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3818,7 +3982,7 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3827,33 +3991,33 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nešifrovane veze. Jeste li sigurni da "
 "želite to da uradite?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Ovo nije grupni razgovor"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Smajliji isključeni"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Vaša tema za smajlije nije nađena, pa su smajliji isključeni."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr "Vaša tema za smajlije nije nađena, pa su smajliji isključeni."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3861,41 +4025,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "podrazumevano"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Lozinka neophodna"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG ključ istekao"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vaš GPG ključ je istekao, bićete povezani sa %s bez OpenPGP-a."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Neispravna lozinka"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
@@ -3967,6 +4131,11 @@ msgstr "- poruke će biti logovane"
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti logovane"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3998,7 +4167,7 @@ msgstr "Neispravna soba"
 msgid "The form is not filled correctly."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -4127,6 +4296,56 @@ msgstr ""
 "%s\n"
 "Poruke lokalne mreže možda neće raditi kako treba."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Nije moguće pokrenuti lokalni servis"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ne mogu učitati sliku"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Servis je vratio grešku."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Ne mogu učitati sliku"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Veza nije dostupna"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4152,7 +4371,17 @@ msgstr "Ne možete izbrisati Vašu trenutnu temu"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Spojeni nalozi"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Koristi G_PG agenta"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
@@ -4176,6 +4405,11 @@ msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Ukloni"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4369,51 +4603,65 @@ msgstr "Izmeni lozinku"
 msgid "Login Options"
 msgstr "_Smajliji:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus ne postoji na ovom računaru ili nema python modula."
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "naredba"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste kontakata "
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "Iskače prozor sa sledećim događajem na čekanju"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Ispisuje listu svih kontakata sa liste kontakata. Svaki kontakt je u "
 "posebnoj liniji"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "nalog"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "prikazuje samo kontakte sa ovog naloga"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registrovanih naloga"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Menja status jednog ili više naloga"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4422,11 +4670,17 @@ msgstr ""
 "jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
 "uznemiravaj, nevidljiv"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "poruka"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "statusna poruka"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4435,16 +4689,21 @@ msgstr ""
 "svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
 "statusom\""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Menja status jednog ili više naloga"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "prioritet"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "prioritet koji želite da date ovom nalogu"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4452,7 +4711,7 @@ msgstr ""
 "izmena prioriteta datog naloga. Ako nije određen, menja se status svih "
 "naloga koji imaju postavljenu opciju \"sinhronizacija sa globalnim statusom\""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4462,29 +4721,29 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je naznačeno, poruka će biti šifrovana koristeći ovaj javni ključ"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je naznačeno, poruka će biti poslata koristeći ovaj nalog"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4494,120 +4753,120 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "tema poruke"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku na grupni razgovor kome ste se pridružili."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "Džaber ID kontakta"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o nalogu"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Ime naloga"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Šalje datoteku kontaktu"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "datoteka"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Putanja do datoteke"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ako je naznačeno, datoteka će biti poslata koriteći ovaj nalog"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Prikazuje sva podešavanja i njihove vrednosti"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "ključ=vrednost"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'ključ' je ime stavke podešavanja, 'vrednost' je vrednost na koju će se "
 "stavka postaviti"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Briše stavku podešavanja"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "ključ"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "ime stavke podešavanja koje će se brisati"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim podešavanja u .config datoteku"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je naznačeno, kontakt se uzima sa liste kontakata ovog naloga"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ako nije naznačen nalog)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Šalje korisnički definisan XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4616,17 +4875,17 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Izmeni status"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Nadimak za korišćenje"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4635,19 +4894,19 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Molimo proverite da li je Gajim pokrenut"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4656,15 +4915,15 @@ msgstr ""
 "'%s' nije na Vašj listi.\n"
 "Molimo odredite nalog za slanje poruke."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Čini se da Gajim ne radi. Ne možete da koristite gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4673,16 +4932,16 @@ msgstr ""
 "Korišćenje: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4693,7 +4952,7 @@ msgstr ""
 "Korišćenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4702,7 +4961,7 @@ msgstr ""
 "Previše argumenata\n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4876,11 +5135,6 @@ msgstr "Kraj nedelje"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP nalog %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4905,52 +5159,52 @@ msgstr "Soba grupnog razgovora je uništena"
 msgid "You can join this room instead: %s"
 msgstr "Možete se priključiti sobi %s umesto ove"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova samostalna poruka od kontakta %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privatna poruka sa grupnog razgovora %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je promenio status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s je na vezi"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s je otišao"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Nije u listi kontakata"
 
@@ -5782,22 +6036,18 @@ msgstr "Omogući ESessions enkripciju za ovaj nalog."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Da li će Gajim automatski startovati šifrovanu sesiju ako je moguće?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Uređena lista (odvojena zarezima) tipova konekcije za probu. Može sadržati "
-"tls, ssl ili plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5805,48 +6055,48 @@ msgid ""
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Prikaži prozor upozorenja pre korišćenja standardne SSL biblioteke."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista ssl grešaka za ignorisanje, odvojena razmacima."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Slanje belina posle neaktivnosti"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "Slanje XMPP pinga posle neaktivnosti"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -5855,11 +6105,11 @@ msgstr ""
 "Koliko sekundi čekati na odgovor o paketima o živosti pre nego što pokušamo "
 "ponovno uspostavljanje veze."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 privremeno rešenje"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5867,21 +6117,21 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti Vašu IP adresu u proksi koji je "
 "difinisan u file_transfer_proxies podešavanjima za prenos."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtev primanja"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Poslati zahtev primanja"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5889,12 +6139,12 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s Vam želi poslati datoteku."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5902,150 +6152,160 @@ msgstr ""
 "Kada se uspostavlja šifrovana sesija, da li Gajim treba da pretpostavi da "
 "želite da čuvate poruke u dnevniku?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anonimno prijavljivanje"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anon_imno prijavljivanje"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anon_imno prijavljivanje"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik u kome želite proveravati neispravno napisane reči"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr "Koliko linija tražiti od servera pri ulasku na grupni razgovor."
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr "Od pre koliko minuta tražiti dnevnike pri ulasku na grupni razgovor."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite poruku."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Radim."
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Radim."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Napolju"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6054,27 +6314,27 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "zelena"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "namirnice"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "ljudska"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "morska"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Za"
@@ -6153,37 +6413,50 @@ msgstr "Sve nepročitane poruke su prosleđene."
 msgid "Forward unread message then disconnect"
 msgstr "Prosledi nepročitane poruke"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Datoteka je prazna"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Datoteka ne postoji"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "kreiram bazu dnevnika"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "kreiram bazu dnevnika"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Pošalji %s za %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s je datoteka, ali bi trebala biti fascikla"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim će se sada završiti"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je fascikla, ali bi trebala biti datoteka"
@@ -6193,11 +6466,11 @@ msgstr "%s je fascikla, ali bi trebala biti datoteka"
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cijan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
@@ -6206,188 +6479,188 @@ msgstr "prebacujem bazu dnevnika u indekse"
 msgid "%s is not a valid loglevel"
 msgstr "%s nije ispravan nivo logovanja"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Nisam uspeo da uzmem sertifikat izdavača"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Nisam uspeo da uzmem CRL sertifikata"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nisam uspeo da dešifrujem potpis sertifikata"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nisam uspeo da dešifrujem CRL sertifikata"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Nisam uspeo da dekodiram javni ključ izdavača"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu sertifikata"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Greška u CRL sertifikata"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Sertifikat još nije validan"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Sertifikat je istekao"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "CRL nije još validan"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Greška u formatu sertifakovog polja od kada je validan"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Greška u formatu sertifakovog polja do kada je validan"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja poslednjeg ažuriranja"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja sledećeg ažuriranja"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Nemam više memorije"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Samopotpisani sertifikat u lancu sertifikata"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "U nemogućnosti da uzmem sertifikat lokalnog izdavača"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "U nemogućnosti da verifikujem prvi sertifikat"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Lanac sertifikata predugačak"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Sertifikat povučen"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Neispravan sertifikat sertifikacionog tela (CA)"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Prekoračena dužina putanje"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha sertifikata"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Sertifikatu se ne veruje"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Sertifikat odbačen"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Pogrešna tema izdavača sertifikata"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Identifikator ključa autorizatora i teme se ne poklapaju"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Serijski broj autorizatora i izdavača se ne poklapaju"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Izgubljena veza sa računom \"%s\""
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Ponovo se povežite ručno."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s je loše odgovorio na zahtev registracije:: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s je ponudio drugačiju formu za registraciju"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server je odgovorio: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Veza sa %s nije moguća"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Izgubljena veza sa nalogom %s. Pokušajte ponovo da se konektujete."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Autentičnost sertifikata %s može biti neispravna."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6396,7 +6669,7 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6405,38 +6678,38 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Autentičnost sertifikata %s može biti neispravna."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Prijavljivanje sa \"%s\" neuspešno"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Molimo Vas da proverite Vaše korisničko ime i lozinku od grešaka."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Poslati kontakti: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Poslati kontakti:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
@@ -7306,159 +7579,184 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Neispravan karakter u imenu hosta."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Potrebna je adresa servera."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Neispravan karakter u korisničkom imenu."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Neispravan karakter u resursu."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?status prenosa:Pauziran"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?kontakt ima status:Nepoznat"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?kontakt ima status:Postoje greške"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Trenutna pretplata:Nijedna"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Za"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Od"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Oboje"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Pitaj (za pretplatu):Nijedna"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Učesnici"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Učesnik"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "piše poruku..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7466,22 +7764,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " iz sobe %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " od korisnika %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " od %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7489,74 +7787,74 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaj na čekanju"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Želio bih da Vas dodam na listu mojih kontakata."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Isteklo vreme za učitavanje slike"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "CRL nije još validan"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Isteklo vreme za učitavanje slike"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informacije o registraciji za transport %s nisu došle na vreme"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "poruka"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Želeo bih da te dodam na moju listu kontakata."
 
@@ -7595,43 +7893,43 @@ msgstr ""
 "Linija sesije nije dostupna.\n"
 "Pročitajte http:/trac.gajim.org/wiki/GajimDBus"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalni servis"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ne mogu se povezati na port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Molimo proverite da li je avahi-demon pokrenut."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promeniti status računa \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Vaša poruka nije mogla biti poslata."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt nije na vezi. Vašu poruku nije moguće poslati."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7877,6 +8175,11 @@ msgstr "_Zabrani"
 msgid "_Add to Roster"
 msgstr "_Dodaj na listu kontakata"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Izvrši naredbu"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8160,11 +8463,11 @@ msgstr "O"
 msgid "Con_tinue"
 msgstr "_Nastavi"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Pauziraj"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Odustani"
@@ -8173,31 +8476,31 @@ msgstr "_Odustani"
 msgid "_Open Containing Folder"
 msgstr "_Otvori sadržavajuću fasciklu"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Prenosi datoteka"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "lista prenosa datoteka"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Lista prenosa aktivnih, završenih i zaustavljenih datoteka"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "_Počisti"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Ukloni završene, prekinute i neuspele prenose datoteka iz liste"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Ukloni prenos datoteka sa liste"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8205,32 +8508,37 @@ msgstr ""
 "Ova akcija uklanja prenos datoteke sa liste. Ako je prenos aktivan, prvo se "
 "zaustavlja, pa onda uklanja"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Prekini prenos označene datoteke i izbriši nedovršenu datoteku"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Prekini prenos datoteke"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Prekini prenos označene datoteke"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Pošalji i zatvori"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Sakriva prozor"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Obavesti me kada se završi prenos datoteke"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Prikazuje listu prenosa datoteka između Vas i ostalih"
 
@@ -8239,7 +8547,7 @@ msgid "Register to"
 msgstr "Registruj se na"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_U redu"
 
@@ -8270,21 +8578,21 @@ msgstr "Font"
 msgid "Clear formatting"
 msgstr "Očisti formatiranje"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Prikaži listu smajlija (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Odaberite datoteku za slanje..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Prikaži listu smajlija (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "događaj"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "događaj"
@@ -8347,7 +8655,7 @@ msgstr "<b>Font</b>"
 msgid "<b>#</b>"
 msgstr "<b>Font</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9111,10 +9419,6 @@ msgstr "_Otvori..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Napredna izmena konfiguracije</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Napredno"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Započni ra_zgovor"
@@ -9356,7 +9660,7 @@ msgid "_Open Email Composer"
 msgstr "_Otvori sastavljač e-mejla"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Započni razgovor"
 
@@ -9401,6 +9705,10 @@ msgstr "Podešavanja"
 msgid "Default:"
 msgstr "Podrazumevano"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Dodaj novi kontakt"
@@ -9426,6 +9734,16 @@ msgstr "_Nadimak:"
 msgid "_Group:"
 msgstr "_Grupa:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "ID korisnika:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Nadimak"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9464,6 +9782,11 @@ msgstr ""
 "Morate biti povezani na transport da biste mogli\n"
 "dodavati kontakte sa ovog protokola."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Izmeni statusnu poruku"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Raspoloženje:</b>"
@@ -9689,10 +10012,9 @@ msgstr "_Izvrši naredbu..."
 msgid "_Verify"
 msgstr "_Potvrdi"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Nalozi"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b> info)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9719,11 +10041,6 @@ msgstr "Prikaži samo _aktivne kontakte"
 msgid "Show Transports"
 msgstr "Prikaži trans_porte"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Prenosi datoteka"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9798,48 +10115,33 @@ msgstr "Umanji prozor na auto povezivanje"
 msgid "Pr_int status:"
 msgstr "Ispis statusa:"
 
-#: gajim/data/gui/exception_dialog.ui:7
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Exception"
-msgstr "Opis"
+msgid ""
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
+msgstr "Najverovatnije nije ništa strašno, ali je ipak javite programerima."
 
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:115
 #, fuzzy
 msgid "Report Bug"
 msgstr "_Prijavi grešku"
 
-#: gajim/data/gui/exception_dialog.ui:89
-#, fuzzy
-msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
-msgstr "Najverovatnije nije ništa strašno, ali je ipak javite programerima."
-
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Zahtev za pretplatom"
-
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Odbij"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Odbij autorizaciju tako da ne može da vidi kada ste na vezi"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Akcije"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Odobri autorizaciju"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Odobri autorizaciju kontakta tako da može da vidi kada ste na vezi"
 
@@ -9857,11 +10159,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Prisutnost"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Pozovi prijatelje!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9870,15 +10172,20 @@ msgstr ""
 "Započećete grupni razgovor.\n"
 "Odaberite kontakte koje želite da pozovete"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Molimo odaberite server grupnog razgovora."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Server grupnog razgovora"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Pozo_vi"
 
@@ -9998,11 +10305,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Čisti"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10164,6 +10466,16 @@ msgstr "Prikaži sv_e događaje na čekanju"
 msgid "Mute Sounds"
 msgstr "Ugasi zvukove"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Podešavanja"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "_Izlaz"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Za:"
@@ -10568,14 +10880,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Konfiguracija sobe"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Džaber IM Klijent"
@@ -10700,6 +11004,31 @@ msgid "Plugin manager"
 msgstr "Registracija neuspela"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP nalog %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Opis"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>neko@domaćin.com</b> želi da <b>dodate</b> neke kontakte u listu "
+#~ "kontakata."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Uređena lista (odvojena zarezima) tipova konekcije za probu. Može "
+#~ "sadržati tls, ssl ili plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Akcije"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Zahteva python-dbus."
 
@@ -10900,12 +11229,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Način korišćenja: /%s, sakriva dugmad."
 
-#~ msgid "File is empty"
-#~ msgstr "Datoteka je prazna"
-
-#~ msgid "File does not exist"
-#~ msgstr "Datoteka ne postoji"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10935,58 +11258,6 @@ msgstr "Registracija neuspela"
 #~ msgstr "Zahteva python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?status prenosa:Pauziran"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?status prenosa:Pauziran"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?kontakt ima status:Nepoznat"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?kontakt ima status:Postoje greške"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Trenutna pretplata:Nijedna"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Pitaj (za pretplatu):Nijedna"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?ispis statusa:Sve"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:None"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Dostupan"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "nalog"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "poruka"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "prioritet"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "soba"
 
@@ -10998,30 +11269,6 @@ msgstr "Registracija neuspela"
 #~ msgid "?CLI:password"
 #~ msgstr "lozinka"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Grupni razgovori"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Skidanje"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Slanje"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?status prenosa:Pauziran"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Klijent:Nepoznat"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Nepoznat"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Vreme:Nepoznato"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Koristi DBus i demon obaveštenja za prikazivanje obaveštenja"
 
@@ -11228,9 +11475,6 @@ msgstr "Registracija neuspela"
 #~ msgid "Choose _Key..."
 #~ msgstr "Odaberite _Ključ"
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Koristi G_PG agenta"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr "Ako je označeno, Gajim će uzeti lozinku od GPG agenta"
@@ -11357,18 +11601,6 @@ msgstr "Registracija neuspela"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML Unos</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filter:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML Unos</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Pošalji"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML Konzola za %s"
 
@@ -11772,9 +12004,6 @@ msgstr "Registracija neuspela"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESession</b> info)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Ime kontakta"
@@ -11787,13 +12016,6 @@ msgstr "Registracija neuspela"
 #~ msgid "All Chat Histories"
 #~ msgstr "Svi statusi"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>neko@domaćin.com</b> želi da <b>dodate</b> neke kontakte u listu "
-#~ "kontakata."
-
 #~ msgid "More"
 #~ msgstr "Još"
 
@@ -12707,9 +12929,6 @@ msgstr "Registracija neuspela"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenPGP"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
diff --git a/po/sv.po b/po/sv.po
index c6522b7d6..fa440cb0f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2009-10-29 10:21+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -27,20 +27,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Fel."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Verkligen skicka filen?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -98,70 +98,70 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Förlopp"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnamn: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Storlek: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Du"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Mottagare: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sparad i: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Filöverföring färdig"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "_Öppna mapp"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Filöverföringen avbruten"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Anslutning med motpart kan inte etableras."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottagare: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Felmeddelande: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Filöverföringen stoppad"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -169,34 +169,34 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Välj fil att skicka..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Skicka"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Beskrivning: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim kan inte komma åt denna fil"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan inte skriva över befintliga filen \"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -204,93 +204,93 @@ msgstr ""
 "En fil med det här namnet existerar redan och du har inte rättigheter att "
 "skriva över den."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Vad vill du göra?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" är inte skrivbar"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har inte rättigheter att skapa filer i den här katalogen."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Spara fil som..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Skickar profil..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Fel i Filöverföring"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Ogiltig Fil"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Fil: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Namn: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Sändare: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Paus"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Fortsätt"
 
@@ -449,43 +449,64 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Kräver python-gnome2."
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Tillgänglig"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Funktion"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Fel vid parsning av fil:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Utökning stöds inte"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Bilden kan inte sparas i %(type)s format. Spara som %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Spara bild som..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Har "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Klient:Okänd"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Okänt"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Tid:Okänd"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tillhörighet:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -494,7 +515,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -503,39 +524,49 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Du och kontakten är intresserade av varandras närvaroinformation"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Du och kontakten är intresserade av varandras närvaroinformation"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du väntar på kontaktens svar på din förfrågan om prenumeration"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Det finns inga väntande prenumerationsbegäran."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Alla filer"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Städar"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Hantera proxyprofiler"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -579,13 +610,13 @@ msgid "_New Group Chat"
 msgstr "_Ny gruppchatt"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Inte i kontaktlista"
 
@@ -598,7 +629,7 @@ msgstr "Jag skulle vilja lägga till dig i min kontaktlista"
 msgid "Send Single _Message…"
 msgstr "Skicka ett _meddelande"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Skicka a_npassad status"
@@ -616,25 +647,25 @@ msgstr "_Hantera transport"
 msgid "_Modify Transport"
 msgstr "_Ändra transport"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "Byt _namn"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "A_vblockera"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Blockera"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "Ta _bort"
@@ -648,209 +679,229 @@ msgstr "_Information"
 msgid "Send File..."
 msgstr "Skicka _fil..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Bjud in _kontakter"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Lägg till i kontaktlista"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 msgid "Video Session"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Information"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Historik"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Hantera rum"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Byt _ämne..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Konfigurera _rum..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "Förstör %s"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Byt smek_namn..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Bokmärk detta rum (Ctrl+B)"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Röst"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Förvalda meddelanden:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Minimera vid stängning"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "_Kör kommando"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Koppla från"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Gå in i gruppchatt"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Lägg till kontakt..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "fil"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "_Upptäck tjänster"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Skicka ett _meddelande..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Avancerat"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "_Inställningar"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Synkronisera"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Integritetslistor"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Server"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "XML-konsol"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Admin"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Skicka servermeddelande..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Ange MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Uppdatera MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Ta bort MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Inget konto tillgängligt"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Konton"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "meddelande"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "_Känsloikoner:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Datum"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Meddelande"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Ämne"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Vill du städa upp databasen? (DU AVRÅDS ATT GÖRA DETTA OM GAJIM KÖRS)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -865,99 +916,99 @@ msgstr ""
 "\n"
 "Om du väljer JA, vänta..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Databasfel"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Exporterar Loggar..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Vill du verkligen ta bort det valda meddelandet?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Vill du verkligen ta bort loggar för den valda kontakten?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Denna tjänst kunde inte hittas"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Avbryt bekräftelse"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
 msgstr[1] "Vill du verkligen ta bort det valda meddelandena?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Denna operation kan inte göras ogjord."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Hämtar profil..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Kunde inte läsa in bild"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kontaktinformation"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Format: ÅÅÅÅ-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Information togs emot"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Du kan inte publicera din kontaktinformation utan en anslutning."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Skickar profil..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Informationen INTE publicerad"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "publicering av vCard misslyckades"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -975,10 +1026,10 @@ msgstr "Kontaktens namn: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Allmänt"
@@ -1065,36 +1116,36 @@ msgstr "Fyll i informationen om kontakten du vill lägga till i konto %s"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyll i informationen om kontakten du vill lägga till"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan inte lägga till dig själv i din kontaktlista."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i kontaktlistan"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Denna kontakt finns redan i din kontaktlista."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Användar-id:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Fel när tjänsten lades till. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1102,50 +1153,50 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "En GTK+-baserad Jabber-klient"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ version:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK version:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Nuvarande utvecklare:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Tidigare utvecklare:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "Sist men inte minst vill vi tacka alla anvsraiga paketerare."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -1155,12 +1206,12 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Ordbok för språket %s inte tillgängligt"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1173,12 +1224,12 @@ msgstr ""
 "\n"
 "Markeringsfunktionen för felstavade ord kommer inte att användas"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1190,498 +1241,521 @@ msgstr ""
 "installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
 "skicka lösenordet?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Fråga mig i_nte igen"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Smeknamnet innehåller icke-tillåtna tecken."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Prenumerationsbegäran"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Prenumerationsbegäran för kontot %(account)s från %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Gå in i gruppchatt"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Ogiltigt rum"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Skapa ett nytt, tomt tema med ditt önskade namn."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Ogiltigt JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Felaktig uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Det här är ingen gruppchatt"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Namn"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Server"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Detta konto är inte anslutet till servern"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan inte synkronisera med ett konto utan att vara ansluten."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Fortsatt konversation"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Ny gruppchatt"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Lägg till ny kontakt"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan inte ändra ditt lösenord utan en anslutning."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Kontakten loggade in"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Kontakten ändrade status"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Ett meddelande med kontot %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Ett meddelande i kontot %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Från %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "Anslutningen är inte tillgänglig"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 "Det gick inte att skicka ett meddelande till %s, denna JID är inte giltig."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Städar"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filter:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML-inmatning</b>"
+
+#: gajim/dialogs.py:3572
+msgid "Send"
+msgstr "Sänd"
+
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "add"
 msgstr "Ledsen"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 #, fuzzy
 msgid "modify"
 msgstr "Ändra"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 #, fuzzy
 msgid "remove"
 msgstr "Ta _bort"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%s</b> vill att du <b>%s</b> några kontakter i din kontaktlista."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Lägg till"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Ändra"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Ta bort"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Grupper"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s föreslog att lägga till dig i min kontaktlista."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "_Lägg till kontakt"
 msgstr[1] "_Lägg till kontakt"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Ta bort en kontakt från kontaktlista"
 msgstr[1] "Ta bort en kontakt från kontaktlista"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "_Inställningar"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Tjänsten returnerade ett fel."
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Fel."
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber-ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privat identitetslista <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privat integritetslista för %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Integritetslista"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ordning: %(order)s, åtgärd: %(action)s, typ: %(type)s, värde: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordning: %(order)s, åtgärd: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redigera en regel</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Lägg till en regel</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privata integritetslistor för %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Ogiltigt listnamn"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Du måste ange ett namn för att skapa en integritetslista."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har bjudit in dig till en diskussion"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har bjudit in dig till gruppchatten %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Vill du acceptera inbjudan?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Bilder"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Välj Bild"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Alla filer"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr ""
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr ""
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr ""
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "för kontot %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1705,320 +1779,358 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL-certifikatfel"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Filöverföringar"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Kryptering deaktiverad"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s är nu känd som %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s är nu %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du är inte längre i gruppchatten \"%(room)s\" eller \"%(nick)s\" har lämnat."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Metakontakter kan inte lagras på din server"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Förstör %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Infoga smeknamn"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "och autentiserad"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "och INTE autentiserad"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s-kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din chattsession %(logged)s att loggas."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Konversation med "
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Fortsatt konversation"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s har ställt in ämnet till %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Rummet visar nu otillgängliga medlemmar"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "rummet visar nu inga otillgängliga medlemmar"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Rumsloggning är nu aktiverad"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Rumsloggning är nu inaktiverad"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Rummet är nu icke-anonymt"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Rummet är nu semi-anonymt"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Rummet är nu fullständigt anonymt"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Rumsloggning är aktiverad"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Ett nytt rum har skapats"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Servern har tilldelat eller ändrat ditt rumsnamn"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst av %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Anknytning: "
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "rumskonfigurationen har ändrats till members-only"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "systemet stängs av"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s av %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Är du säker på att du vill lämna gruppchatten \"%s\"?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Du kommer att bli frånkopplad från denna gruppchatt om du stänger detta "
 "fönster."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Filöverföringar"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Filöverföringar"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Visa en lista över formateringar"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "Denna kontakt har inte stöd för filöverföringar."
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s från gruppchatten %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Sessionsförhandlingen avbröts"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "Sessionen KOMMER INTE att loggas"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Denna session är krypterad"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " och KOMMER att loggas"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " och KOMMER INTE att loggas"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2026,16 +2138,16 @@ msgstr ""
 "Fjärrkontaktens identitet har inte verifierats. Klicka på sköldknappen för "
 "mer information."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E-kryptering inaktiverad"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du tog just emot ett meddelande från \"%s\""
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2043,7 +2155,7 @@ msgstr ""
 "Om du stänger den här fliken och har historik inaktiverad så kommer "
 "meddelandet att förloras."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2052,7 +2164,7 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2061,98 +2173,98 @@ msgstr ""
 "Kunde inte dekryptera meddelande från %s\n"
 "Det kan ha manipulerats."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s är nu %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Filöverföringar"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "Storlek: "
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "Acceptera"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Gå in i"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Fjärrkontakten stoppade överföringen"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Fel vid öppnande av filen"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Gruppchattar"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Transporter"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Auktorisering har sänts"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Om \"%s\" accepterar din förfrågan kommer du att känna till hans eller "
 "hennes status."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Auktorisering har tagits bort"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG är inte användbar"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2160,11 +2272,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2172,38 +2284,38 @@ msgstr ""
 "Om du byter status till osynlig kommer du att förlora anslutningen till "
 "gruppchatterna. Är du säker på att du vill byta status till osynlig?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "inte i synk"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Verkligen avsluta Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Är du säker på att du vill avsluta Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Stäng alltid Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "Avbryt filöverföring"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2211,16 +2323,16 @@ msgstr ""
 "Meddelanden kommer endast vara tillgängliga för läsning senare om du har "
 "historik aktiverat och kontakten finns i din kontaktlista."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Du måste läsa dem innan du tar bort denna transport."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2228,11 +2340,11 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "med denna transport."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Transporter kommer att tas bort"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2241,69 +2353,69 @@ msgstr ""
 "Du kommer inte längre att kunna ta emot eller skicka meddelanden till "
 "kontakter från dessa transporter: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Byt namn på kontakt"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Ange ett nytt smeknamn för kontakten %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Byt namn på grupp"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Ange ett nytt namn för gruppen %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vill du ta bort gruppen %s från kontaktlistan?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ta även bort alla kontakter i denna grupp från din kontaktlista"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" kommer att tas bort från kontaktlistan"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Du är på väg att ta bort \"%(name)s\" (%(jid)s) från din kontaktlista.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2313,11 +2425,11 @@ msgstr ""
 "så kommer du även ta bort behörigheten vilket resulterar i att kontakten "
 "kommer alltid se dig som frånkopplad."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2326,17 +2438,17 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
 "Kontakten kommer alltid se dig som frånkopplad."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Jag vill att denna kontakten skall känna till min status även efter "
 "borttagningen"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter kommer att tas bort från din kontaktlista"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2346,38 +2458,38 @@ msgstr ""
 "så kommer du även ta bort behörigheten vilket resulterar i att kontakten "
 "kommer alltid se dig som frånkopplad."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 "Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan inte gå in i en gruppchatt när du är osynlig"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2386,13 +2498,13 @@ msgstr ""
 "Din server saknar stöd för att lagra information om metakontakter. Denna "
 "information kommer därför inte att sparas vid nästa återanslutning."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2402,196 +2514,196 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ogiltig Fil"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vill du skicka denna fil till %s:"
 msgstr[1] "Vill du skicka dessa filer till %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Skicka %s till %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "Gör %s till en metakontakt för %s"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Gör %s till en metakontakt för %s"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Ändra statusmeddelande"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Publicera låt"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicera låt"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Konfigurera tjänster..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Maximera alla"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Skicka gruppm_eddelande"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Till alla användare"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Till alla anslutna användare"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Bjud _in till"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Hantera kontakter"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Redigera _grupper"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "Ta _bort"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Maximera"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Koppla från"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Koppla från"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Historik"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Historikhanterare"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Gå in i ny gruppchatt"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Ändra statusmeddelande"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Visa enbart i _registret"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Avancerad konfigurationsredigerare"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Rumkonfiguration"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Visa alla väntande _händelser"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Databasfel"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Vad vill du göra?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ansluter"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Vidarebefordra olästa meddelanden"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2600,7 +2712,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2608,7 +2720,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2754,16 +2866,16 @@ msgstr "Känsloikoner inaktiverade"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Ange ditt lösenord för kontot %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Spara lösenord"
 
@@ -2795,10 +2907,18 @@ msgstr "Ta bort kontot _endast från Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "?print_status:Alla"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "In- och utgång enbart"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "?print_status:Ingen"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Ny gruppchatt"
@@ -2865,11 +2985,11 @@ msgstr "Ogiltig post"
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Certifikatet finns redan i filen"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2974,90 +3094,114 @@ msgstr "Meddelande markerat i gruppchatt"
 msgid "Group Chat Message Received"
 msgstr "Meddelande mottaget i gruppchatt"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av den här gruppchatten"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+#, fuzzy
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Medlem"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Administratör"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Ägare"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [blockerad]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [minimerad]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Ansluten"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Hämta"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Skicka upp"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Typ: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Inte startad"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Färdigställd"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:Pausad"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Överför"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Status: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?transfer status:Pausad"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Frånvarande"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Upptagen"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Frånkopplad"
 
@@ -3106,126 +3250,130 @@ msgstr "(Ingen)"
 msgid "Hidden"
 msgstr "Dold"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversationshistorik med %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Konversationshistorik"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Diskfel"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s är nu %(status)s:%(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Felmeddelande: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 #, fuzzy
 msgid "Error"
 msgstr "Fel."
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status är nu: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Ändra statusmeddelande"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "använder kontot %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Hantera bokmärken"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktlista"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Visa _kontaktlista"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Dölj denna meny"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Kunde inte läsa in idle-modul"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Osynlighet stöds inte"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Värdnamn:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 #, fuzzy
 msgid "Server Software"
 msgstr "Serverfunktioner"
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Servern svarade: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3383,7 +3531,7 @@ msgstr "_Prenumerera"
 msgid "_Unsubscribe"
 msgstr "Säg _upp prenumeration"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3391,52 +3539,58 @@ msgstr ""
 "Texten under denna linje är vad som har sagts\n"
 "sedan du senast hade fokus på denna gruppchatt"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "A_vsluta"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Åtgärder för \"%s\""
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL för uppslagsbok saknar ett \"%s\" och det är inte en WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Öppna som _länk"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Ogiltigt JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3448,30 +3602,35 @@ msgstr[1] "Igår"
 msgid "Write a message.."
 msgstr "Skicka Privat Meddelande"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Du är på väg att stänga flera flikar"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Vill du verkligen stänga alla dem?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Gruppchatt"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3483,108 +3642,108 @@ msgstr ""
 "av\n"
 "en annan deltagare. Ange ett annat smeknamn nedan:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Använd alltid detta smeknamn när det finns en konflikt"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterar du den här begäran på kontot %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s)-auktorisering för %(url)s (id: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Anslutningsfel"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Ett lösenord krävs för att gå in i rummet %s. Ange lösenordet."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Typsnitt</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Du är bannlyst från gruppchatten %s."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Gruppchatten %s finns inte."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Gruppchatten %s finns inte."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Möjligheten att skapa rum är begränsad."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "Ditt registrerade smeknamn måste användas i gruppchatten %s."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du är inte med i medlemslistan i gruppchatten %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fel %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fel vid sändning av %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Prenumerationsbegäran"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Observerande"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3593,32 +3752,32 @@ msgstr ""
 "Du kommer alltid att se honom eller henne som frånkopplad.\n"
 "Vill du ta bort honom eller henne från din kontaktlista?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Säg _upp prenumeration"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din anslutning eller försök igen senare."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3627,37 +3786,37 @@ msgstr ""
 "Du har konfigurerat Gajim till att använda GPG-agent, men det finns ingen "
 "GPG-agent igång eller så returnerade den en felaktig lösenfras.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Felaktig lösenfras"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Felaktig lösenfras"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Certifikatet har gått ut"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr ""
 "Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
@@ -3666,97 +3825,102 @@ msgstr ""
 "GPG-nyckeln som används för att kryptera denna chatt är inte pålitlig. Vill "
 "du verkligen kryptera detta meddelande?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL-certifikatfel"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Filöverföringar"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(filename)s har skickats till %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Välj fil att skicka..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Kunde inte dekryptera meddelande"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Användarnamn-konflikt"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "Ange ett nytt användarnamn för ditt lokala konto"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Resurskonflikt"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Du är redan ansluten till detta konto med samma resurs. Ange en annan"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Fel vid verifiering av SSL-certifikat"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3767,7 +3931,7 @@ msgstr ""
 "server: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3780,15 +3944,15 @@ msgstr ""
 "SHA1-fingeravtryck för certifikatet:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ignorera detta fel med certifikatet."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3809,7 +3973,7 @@ msgstr ""
 "\n"
 "Vill du fortfarande ansluta och uppdatera fingeravtrycket för certifikatet?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3818,7 +3982,7 @@ msgstr ""
 "installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
 "skicka lösenordet?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -3827,16 +3991,16 @@ msgstr ""
 "Du är på väg att skicka ditt lösenord över en okrypterad anslutning. Är du "
 "säker på att du vill göra det?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Det här är ingen gruppchatt"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -3844,7 +4008,7 @@ msgstr ""
 "Ditt konfigurerade känsloikontema hittades inte så känsloikoner har "
 "inaktiverats."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
@@ -3853,11 +4017,11 @@ msgstr ""
 "Ditt konfigurerade känsloikontema hittades inte så känsloikoner har "
 "inaktiverats."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Det här är ingen gruppchatt"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3865,42 +4029,42 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "standard"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG-nyckeln har gått ut"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG-nyckel har gått ut. Du kommer anslutas till %s utan OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
@@ -3971,6 +4135,11 @@ msgstr "- meddelanden kommer att loggas"
 msgid "- messages will not be logged"
 msgstr "- meddelanden kommer inte att loggas"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenGPG"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4003,7 +4172,7 @@ msgstr "Ogiltigt rum"
 msgid "The form is not filled correctly."
 msgstr "Smeknamnet innehåller icke-tillåtna tecken."
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Osynlig"
 
@@ -4135,6 +4304,57 @@ msgstr ""
 "%s\n"
 "Link-local-meddelanden kanske inte fungerar korrekt."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Kunde inte starta lokal tjänst"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Kunde inte läsa in bild"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Tjänsten returnerade ett fel."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Kunde inte läsa in bild"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+#, fuzzy
+msgid "Encryption Error"
+msgstr "Kryptering aktiverad"
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "En anslutning är inte tillgänglig"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Tema"
@@ -4160,7 +4380,17 @@ msgstr "Du kan inte ta bort ditt nuvarande tema"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Sammanfoga konton"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Använd G_PG-agent"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Strax tillbaka."
 
@@ -4181,6 +4411,11 @@ msgstr "Du har öppnat chatt i kontot %s"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alla chatts- och gruppchattsfönster kommer stängas. Vill du fortsätta?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "Ta _bort"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4374,63 +4609,83 @@ msgstr "Byt lösenord"
 msgid "Login Options"
 msgstr "_Känsloikoner:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus finns inte på den här maskinen eller så saknas pythonmodulen"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Visar hjälp för ett specifikt kommando"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "kommando"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "visar hjälp för kommando"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Visar eller döljer kontaktlistan"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Öppnar ett fönster med nästa olästa meddelande"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Skriver ut en lista över alla kontakter i kontaktlistan. Varje kontakt "
 "hamnar på en egen rad"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "konto"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "visa bara kontakter för det givna kontot"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Skriver ut en lista över registrerade konton"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Ändrar status för konto eller konton"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "status"
+
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "meddelande"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "statusmeddelande"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4438,17 +4693,22 @@ msgstr ""
 "ändra status för kontot \"konto\". Om inte angivet, försök ändra status på "
 "alla konton som har alternativet \"synkronisera med global status\" inställt"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Ändrar status för konto eller konton"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "Priori_tet:"
+
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Jag vill _registrera ett nytt konto"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4457,7 +4717,7 @@ msgstr ""
 "ändra status för kontot \"konto\". Om inte angivet, försök ändra status på "
 "alla konton som har alternativet \"synkronisera med global status\" inställt"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4468,30 +4728,30 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "meddelandeinnehåll"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "om specificerat kommer meddelandet bli krypterat med den här publika nyckeln"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "om specificerat kommer meddelandet bli skickat genom det här kontot"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4501,123 +4761,123 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "ämne"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "meddelandeämne"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Skickar nytt meddelande till en gruppchatt som du gått in i."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID för rummet som kommer ta emot meddelandet"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Hämta detaljerad information om kontakt"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID för kontakten"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Hämtar detaljerad information för kontakt"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Namn för kontot"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Skicka fil till en kontakt"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "fil"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Sökväg"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "om specificerat kommer filen bli skickad genom det här kontot"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Listar alla inställningar och deras värden"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "\"nyckel\" är namnet på inställningen, \"värde\" är värdet att sätta den till"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Tar bort en inställning"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "nyckel"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "namnet på inställningen som skall tas bort"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "om specificerat tas kontakten bort från kontaktlistan för det här kontot"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande status (global status om inget konto specificerats)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande statusmeddelande (det globala om inget konto "
 "specificerats)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Returnerar antalet olästa meddelanden"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Skickar anpassad XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML att skicka"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4626,17 +4886,17 @@ msgstr ""
 "Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
 "skickas till alla konton"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Ändra status"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Picture to use"
 msgstr "Smeknamn att använda"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4645,19 +4905,19 @@ msgstr ""
 "Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
 "skickas till alla konton"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Kontrollera om Gajim är igång"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Visar eller döljer ipython-fönstret"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4666,17 +4926,17 @@ msgstr ""
 "\"%s\" finns inte i din kontaktlista.\n"
 "Ange konto för att skicka meddelandet."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Det verkar som om Gajim inte är igång. Därför kan du inte använda gajim-"
 "remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4685,16 +4945,16 @@ msgstr ""
 "Användning: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4705,7 +4965,7 @@ msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4714,7 +4974,7 @@ msgstr ""
 "För många argument. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer information"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4888,11 +5148,6 @@ msgstr "Slutet av veckan"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP-kontot %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4918,52 +5173,52 @@ msgstr "Auktorisering har tagits bort"
 msgid "You can join this room instead: %s"
 msgstr "Du kan gå in i detta rum istället: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Okänt SSL-fel: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nytt privat meddelande från gruppchatten %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Skickat av %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ändrade status"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s loggade in"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s loggade ut"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Inte i kontaktlista"
 
@@ -5722,20 +5977,18 @@ msgstr "Aktivera ESessions-kryptering för detta konto."
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Ska Gajim automatiskt starta en krypterad session när det är möjligt?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -5743,58 +5996,58 @@ msgid ""
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Visa en varningsdialog innan standard-SSL-biblioteket används."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Temporär lösning för Jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5802,21 +6055,21 @@ msgstr ""
 "Om kryssad så kommer Gajim att använda ditt IP och proxyservrar definerade i "
 "alternativet file_transfer_proxies för filöverföringar."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr ""
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
@@ -5824,159 +6077,169 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s vill skicka en fil till dig."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 #, fuzzy
 msgid "Message that is sent to contacts you want to add"
 msgstr "Fyll i informationen om kontakten du vill lägga till"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Anonym autentisering"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Anon_ym autentisering"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Anon_ym autentisering"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Språket för vilket vi vill leta efter felstavade ord"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Äter"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, lämna ett meddelande."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Film"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Arbetar"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Ute"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Jag är tillgänglig."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Jag är ledig för chatt."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Jag är inte tillgänglig."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Stör inte."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Hejdå!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -5985,27 +6248,27 @@ msgstr ""
 "Ljud att spela när MUC-meddelande innehåller ett av orden i "
 "muc_highlight_words, eller när MUC-meddelande innehåller ditt smeknamn."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ljud att spela upp när ett MUC-meddelande anländer."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "grocery"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "human"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "marine"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Till"
@@ -6084,37 +6347,50 @@ msgstr "Alla olästa meddelanden har vidarebefordrats."
 msgid "Forward unread message then disconnect"
 msgstr "Vidarebefordra olästa meddelanden"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Filen är tom"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Filen finns inte"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "skapar loggdatabas"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "skapar loggdatabas"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Skicka %s till %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s är en fil men den borde vara en katalog"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu att avslutas"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s är en katalog men den borde vara en fil"
@@ -6124,11 +6400,11 @@ msgstr "%s är en katalog men den borde vara en fil"
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "migrerar loggdatabas till index"
 
@@ -6137,189 +6413,189 @@ msgstr "migrerar loggdatabas till index"
 msgid "%s is not a valid loglevel"
 msgstr "%s är inte en giltig loggnivå"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Kunde inte få tag på utfärdarens certifikat"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Kunde inte få tag på certifikatspärrlista"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Kunde inte dekryptera certifikatets signatur"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Kunde inte dekryptera spärrlistans signatur"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Kunde inte avkoda utfärdarens publika nyckel"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Fel i certifikatsignatur"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Fel i spärrlistans signatur"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet är ännu inte giltigt"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Certifikatet har gått ut"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "Spärrlistan är ännu inte giltig"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "Spärrlistan har gått ut"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfel i certifikatets notBefore-fält"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfel i certifikatets notAfter-fält"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfel i spärrlistans lastUpdate-fält"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfel i spärrlistans nextUpdate-fält"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Självsignerat certifikat"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Självsignerat certifikat i certifikatkedja"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Kunde inte verifiera det första certifikatet"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Certifikatkedjan är för lång"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Certifikatet spärrat"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Ogiltigt CA-certifikat"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Certifikatet är inte pålitligt"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Certifikatet nekades"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr ""
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Återanslut manuellt."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Servern %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Servern %s tillhandahöll ett annat registreringsformulär"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarade: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunde inte ansluta till kontot %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Anslutningen med kontot \"%s\" har förlorats. Försök att ansluta igen."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr ""
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6328,7 +6604,7 @@ msgstr ""
 "\n"
 "SSL-fel: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6337,39 +6613,39 @@ msgstr ""
 "\n"
 "Okänt SSL-fel: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr ""
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering mot \"%s\" misslyckades"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Kontrollera ditt inloggningsnamn och lösenord."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Skickade kontakt: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Bjud in _kontakter"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Inte hämtad på grund av osynlig status"
 
@@ -7243,255 +7519,280 @@ msgstr ""
 msgid "video output"
 msgstr ""
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Ogiltigt tecken i värdnamn."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Serveradress krävs."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Ogiltigt tecken i användarnamn"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?transfer status:Pausad"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "Fr_ånvarande"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?kontakt har status:Okänd"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?kontakt har status:Har fel"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Prenumeration vi redan har:Ingen"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Till"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Från"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Båda"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Fråga (för prenumeration):Ingen"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderator"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Deltagare"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Deltagare"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Besökare"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Besökare"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "skriver ett meddelande..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d meddelande väntar"
 msgstr[1] "%d meddelanden väntar"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " från rummet %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " från användaren %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " från %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d väntande händelse"
 msgstr[1] "%d väntande händelser"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Jag vill lägga till dig i min kontaktlista."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr ""
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Bild är för stor"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "Spärrlistan är ännu inte giltig"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registreringsinformation för transporten %s har inte kommit fram i tid"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "meddelande"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
 
@@ -7525,43 +7826,43 @@ msgid ""
 "Try reading %(url)s"
 msgstr "Sessionsbus finns inte tillgänglig."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Kunde inte starta lokal tjänst"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Kunde inte binda till port %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontrollera om avahi-daemon körs."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunde inte ändra status för kontot \"%s\""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Ditt meddelande kunde inte skickas."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten är nerkopplad. Ditt meddelande kunde inte skickas."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7807,6 +8108,11 @@ msgstr "_Bannlys"
 msgid "_Add to Roster"
 msgstr "_Lägg till i kontaktlista"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "_Kör kommando"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8090,11 +8396,11 @@ msgstr "Om"
 msgid "Con_tinue"
 msgstr "_Fortsätt"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Paus"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -8103,31 +8409,31 @@ msgstr "_Avbryt"
 msgid "_Open Containing Folder"
 msgstr "_Öppna mapp"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Filöverföringar"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "filöverföringslista"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "En lista över aktiva, färdigställda och stoppade filöverföringar"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Rensa _upp"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Tar bort färdiga, avbrutna och misslyckade filöverföringar från listan"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Ta bort filöverföring från listan."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8135,33 +8441,38 @@ msgstr ""
 "Denna åtgärd tar bort en filöverföring från listan. Om överföringen är aktiv "
 "så stoppas den först och tas sedan bort"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr ""
 "Avbryter den markerade filöverföringen och tar bort den ofullständiga filen"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Avbryt filöverföring"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Avbryter den markerade filöverföringen"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Skicka och stäng"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Döljer fönstret"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Meddela mig när en filöverföring är färdig"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "När en filöverföring är färdig så visa en popupnotifiering"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Visar en lista med filöverföringar mellan dig och andra"
 
@@ -8170,7 +8481,7 @@ msgid "Register to"
 msgstr "Registrera hos"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_OK"
 
@@ -8201,21 +8512,21 @@ msgstr "Typsnitt"
 msgid "Clear formatting"
 msgstr "Ingen formatering"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Visa en lista över känsloikoner (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Välj fil att skicka..."
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Visa en lista över känsloikoner (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Händelse"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Händelser"
@@ -8278,7 +8589,7 @@ msgstr "<b>Typsnitt</b>"
 msgid "<b>#</b>"
 msgstr "<b>Typsnitt</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -9029,10 +9340,6 @@ msgstr "_Öppna..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Avancerad konfigurationsredigerare</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Avancerat"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Starta _chatt"
@@ -9275,7 +9582,7 @@ msgid "_Open Email Composer"
 msgstr "_Skriv e-post"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Starta chatt"
 
@@ -9320,6 +9627,10 @@ msgstr "Inställningar"
 msgid "Default:"
 msgstr "Standard"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Lägg till ny kontakt"
@@ -9345,6 +9656,16 @@ msgstr "_Smeknamn:"
 msgid "_Group:"
 msgstr "_Grupp:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Användar-id:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Smeknamn"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9383,6 +9704,11 @@ msgstr ""
 "Du måste vara ansluten till transporten för att kunna\n"
 "lägga till en kontakt från det här protokollet."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Ändra statusmeddelande"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Humör:</b>"
@@ -9609,10 +9935,9 @@ msgstr "_Kör kommando..."
 msgid "_Verify"
 msgstr "_Verifiera"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Konton"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b>-info)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9639,11 +9964,6 @@ msgstr "Visa endast _aktiva kontakter"
 msgid "Show Transports"
 msgstr "Visa _transporter"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Filöverföringar"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9717,35 +10037,25 @@ msgstr "Minimera när du gått in automatiskt"
 msgid "Pr_int status:"
 msgstr "Skriv ut status:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Beskrivning"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Rapportera fel"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Det är antagligen inte ödesdigert men det bör dock rapporteras till "
 "utvecklarna oavsett."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Prenumerationsbegäran"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Rapportera fel"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Neka"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9753,16 +10063,11 @@ msgstr ""
 "Neka auktorisering från kontakt så att han eller hon inte vet när du är "
 "ansluten"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Åtgärder"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "Au_ktorisera"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Auktorisera kontakt så att han eller hon vet när du är ansluten"
 
@@ -9780,11 +10085,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Närvaro"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Bjud in vänner!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9793,15 +10098,20 @@ msgstr ""
 "Du är på väg att påbörja en fleranvändarchatt.\n"
 "Välj kontakterna som du vill bjuda in"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Välj en MUC-server."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC-server"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Bjud _in"
 
@@ -9922,11 +10232,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Städar"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10088,6 +10393,16 @@ msgstr "Visa alla väntande _händelser"
 msgid "Mute Sounds"
 msgstr "Inga ljud"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Inställningar"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+#, fuzzy
+msgid "_Quit"
+msgstr "A_vsluta"
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Till:"
@@ -10493,14 +10808,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "Rumkonfiguration"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber-snabbmeddelandeklient"
@@ -10625,6 +10932,24 @@ msgid "Plugin manager"
 msgstr "Registreringen misslyckades"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP-kontot %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Beskrivning"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>någon@någonstans.se</b> vill att du ska <b>lägga till</b> några "
+#~ "kontakter till din kontaktlista."
+
+#~ msgid "_Actions"
+#~ msgstr "_Åtgärder"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Kräver python-dbus."
 
@@ -10818,12 +11143,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Användning: /%s, döljer chattknapparna."
 
-#~ msgid "File is empty"
-#~ msgstr "Filen är tom"
-
-#~ msgid "File does not exist"
-#~ msgstr "Filen finns inte"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10851,59 +11170,6 @@ msgstr "Registreringen misslyckades"
 #~ msgstr "Kräver python-pyopenssl."
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?transfer status:Pausad"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?transfer status:Pausad"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?kontakt har status:Okänd"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?kontakt har status:Har fel"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Prenumeration vi redan har:Ingen"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Fråga (för prenumeration):Ingen"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Gruppchatt kontaktroll:Ingen"
-
-#, fuzzy
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Gruppchatt kontaktroll:Ingen"
-
-#~ msgid "?print_status:All"
-#~ msgstr "?print_status:Alla"
-
-#~ msgid "?print_status:None"
-#~ msgstr "?print_status:Ingen"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Tillgänglig"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "konto"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "status"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "meddelande"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "Priori_tet:"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "rum"
 
@@ -10915,30 +11181,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "?CLI:password"
 #~ msgstr "lösenord"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Gruppchatt"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Hämta"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Skicka upp"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:Pausad"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Klient:Okänd"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Okänt"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Tid:Okänd"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "Använd D-Bus och Notification-Daemon för att visa meddelanden"
 
@@ -11144,9 +11386,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "Choose _Key..."
 #~ msgstr "Välj nyc_kel..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Använd G_PG-agent"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11274,17 +11513,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML-inmatning</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filter:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML-inmatning</b>"
-
-#~ msgid "Send"
-#~ msgstr "Sänd"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "XML-konsol för %s"
 
@@ -11626,9 +11854,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Bjud in kontakter till konversationen (Ctrl+G)"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESession</b>-info)"
-
 #, fuzzy
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Kontaktnamn"
@@ -11641,13 +11866,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "All Chat Histories"
 #~ msgstr "Gamla berättelser"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>någon@någonstans.se</b> vill att du ska <b>lägga till</b> några "
-#~ "kontakter till din kontaktlista."
-
 #~ msgid "More"
 #~ msgstr "Mer"
 
@@ -12578,9 +12796,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
 
-#~ msgid "OpenGPG"
-#~ msgstr "OpenGPG"
-
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
 
@@ -12610,12 +12825,6 @@ msgstr "Registreringen misslyckades"
 #~ "Användning: /%s <handling>, skickar handling till aktivt rum. Använd "
 #~ "tredje person. (t.ex. /%s exploderar.)"
 
-#~ msgid "Encryption enabled"
-#~ msgstr "Kryptering aktiverad"
-
-#~ msgid "Encryption disabled"
-#~ msgstr "Kryptering deaktiverad"
-
 #~ msgid "<b>Please fill in the data for your new account</b>"
 #~ msgstr "<b>Fyll i informationen för ditt nya konto</b>"
 
diff --git a/po/tr.po b/po/tr.po
index 12a542f6b..3e857df24 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13.10.2-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2010-03-24 22:29+0100\n"
 "Last-Translator: Ferdi Kunzmann <shegman@tablatures.de>\n"
 "Language-Team: Turkish\n"
@@ -26,21 +26,21 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "Hata."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
-msgstr ""
+msgstr "_Geri Al"
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
-msgstr ""
+msgstr "_Temizle"
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 #, fuzzy
 msgid "Really send file?"
 msgstr "%s size bir dosya göndermek istiyor:"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -70,9 +70,8 @@ msgid ""
 msgstr ""
 
 #: gajim/session.py:511
-#, fuzzy
 msgid "Always accept for this contact"
-msgstr "Bu dizin için seçici erişim etkinleştirilmemiş"
+msgstr "Bu bağlantı için her zaman kabul et"
 
 #: gajim/filetransfers_window.py:89
 msgid "File"
@@ -86,73 +85,73 @@ msgstr "Süre"
 msgid "Progress"
 msgstr "İlerleme"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosya adı: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, fuzzy, python-format
 msgid "Size: %s"
 msgstr "%1 (boyut %2)"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Sen"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Gönderen: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Alıcı:"
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, fuzzy, python-format
 msgid "Saved in: %s"
 msgstr "ben burdaysam"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 #, fuzzy
 msgid "File transfer completed"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr ""
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Alıcı: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Ileti alınıyor"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -160,126 +159,126 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "%s size bir dosya göndermek istiyor:"
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Gönder"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Açıklama: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "%s sunucu konfigurasyon dosyasına \"%s\" erişilemiyor: %s\n"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "\"%s\" mevcut dosyanın üzerine yazılamıyor"
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Dosyası zaten var"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Ne yapmak istiyorsun?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Klasör \"%s\" yazılabilir değil"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Dosya Farklı Kaydet..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Dosya: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, fuzzy, python-format
 msgid "Type: %s"
 msgstr "_Türü:"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Açıklama: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s size bir dosya göndermek istiyor:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Profil gönderiliyor…"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "Dosya okunurken hata:"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Geçersiz Dosya"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Dosya: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "İsim: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Gönderen"
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Duraklat"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Devam"
 
@@ -448,89 +447,120 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Python Programlama Dili"
 
+#: gajim/features_window.py:94
+#, fuzzy
+msgid "?features:Available"
+msgstr "Mevcut"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Özellik"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Dosya okunurken hata:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 #, fuzzy
 msgid "Error parsing file:"
 msgstr "Dosya okunurken hata:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 #, fuzzy
 msgid "Extension not supported"
 msgstr "Rahatsız etmeyin"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Resimi Farklı Kaydet..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Sahip"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Client:Bilinmez"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?OS:Unknown?OS:Bilinmez"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Time:Bilinmez"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr ""
+
+#: gajim/vcard.py:382
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "üyelik değişti"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr ""
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr ""
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "Bekleyen üyelemek soru yok."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 #, fuzzy
 msgid " resource with priority "
 msgstr "Beni bir açılan pencereyle _haberle"
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Tüm dosyalar"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Temizleniyor"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Vekil Sunuc Profili İşlet"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -577,13 +607,13 @@ msgid "_New Group Chat"
 msgstr "_Yeni Bir Grup Sohbeti"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 #, fuzzy
 msgid "Not in Roster"
 msgstr "Kişi listesindeki olayları göster"
@@ -598,7 +628,7 @@ msgstr "Seni benim kişi listeye eklemek isterdim"
 msgid "Send Single _Message…"
 msgstr "Tek bir İlet gönder"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Ö_zel durum gönder"
@@ -618,25 +648,25 @@ msgstr "Aktarım protokolü"
 msgid "_Modify Transport"
 msgstr "Aktarım protokolü"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "_Ad Değiştir"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "Engellemeyi _Kaldır"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Engelle"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "K_aldır"
@@ -650,211 +680,231 @@ msgstr "_Bilgi"
 msgid "Send File..."
 msgstr "_Dosya Gönder…"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Kişi Davet _Et"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "Kişi listeye _ekle…"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "Ses testi"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "Video testi"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Bilgi"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Geçmiş"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "Yer imlerini işlet"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Konuk Değiştiriliyor"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Çevrimiçi Servisler"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 msgid "Destroy Room"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Takma Ad Ayarla"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Bu odayi yer imle"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Ses"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Önceden hazırlanmış iletleri:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "Kapatınca küçült"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "Komuta _Yürüt"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "Bağlantıyı _kes"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Grup Sohbete Katıl"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "Kişi _ekle"
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "dosya"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 msgid "Discover Services"
 msgstr ""
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "Tek Bir İleti Gönder…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "İlerlemiş"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Tercihler"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Kişisel Gizlilik Listesini biçimle"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "_Sunuc:"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 #, fuzzy
 msgid "XML Console"
 msgstr "_XML Konsolu Göster"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Yönetici"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "Tek Bir İleti Gönder…"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "MOTD'yi yaz"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "MOTD'yi yenileştir"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Sil"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Hesaplar"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "mesaj"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "Duygu _Simgeler:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr ""
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Tarih"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "İleti"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Konu"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -863,103 +913,103 @@ msgid ""
 "In case you click YES, please wait…"
 msgstr ""
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "Hata açıklaması…"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Her checkpoint işlemini kaydeder"
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Paket bulunamadı"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "Dosya transferi iptal et"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 #, fuzzy
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Bu sertifika geçerlidir"
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Profil alınıyor…"
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Resim acılamadı"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 #, fuzzy
 msgid "Wrong date format"
 msgstr "Kişisel Bilgisi"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 #, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "geçersiz saat, format SS:DD şeklinde olmalı"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Bilgi alındı"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 #, fuzzy
 msgid "You are not connected to the server"
 msgstr "Şu anda bir veritabanına bağlı değilsiniz.\n"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Profil gönderiliyor…"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 #, fuzzy
 msgid "Information NOT published"
 msgstr "Rahatsız etmeyin"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 #, fuzzy
 msgid "vCard publication failed"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -976,10 +1026,10 @@ msgstr "İlk Ad:"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber kimliği: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Genel"
@@ -1069,38 +1119,38 @@ msgstr "<b>Lütfen varolan hesapının verisini doldurun</b>"
 msgid "Please fill in the data of the contact you want to add"
 msgstr ""
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 #, fuzzy
 msgid "Invalid User ID"
 msgstr "Geçersiz Jabber kimliği"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr ""
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 #, fuzzy
 msgid "Contact already in roster"
 msgstr "Kişi listesindeki olayları göster"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr ""
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Kullanıcı kimliği:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Eklentilerin etkinleştirilmesinde hata #%d."
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1108,58 +1158,58 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Geçersiz Jabber kimliği"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ Runtime Sürümü"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "<b>Kurulu Sürüm</b>"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Şu Anki Geliştiriciler"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Şu Anki Geliştiriciler"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Oynatıcı için erişim türü kullanılır değil: %s\n"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1168,12 +1218,12 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Tehlikeli bağlantı"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1182,518 +1232,528 @@ msgid ""
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Evet, gerçekten tehlikeli bağlanmak istiyorum"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 #, fuzzy
 msgid "_Do not ask me again"
 msgstr "Bu iletişim kutusunu bir daha _gösterme"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Geçersiz takma ad"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Üyelik İsteği"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr ""
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, fuzzy, python-format
 msgid "Subscription request from %s"
 msgstr "Dosya Gönderme Soru"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Grup Sohbete Katıl"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Geçersiz oda"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Geçersiz Takma ad"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Yeni posta yarat"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Yerel jid:"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "Adres yanlış"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "%s mevcut bir grubun ismi değil"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Adı"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 #, fuzzy
 msgid "Server"
 msgstr "_Sunuc:"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 #, fuzzy
 msgid "Synchronise"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Devam edilen sohbet"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "_Yeni Bir Grup Sohbeti"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Yeni Kişi Ekle"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 #, fuzzy
 msgid "Without a connection, you can not change your password."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 #, fuzzy
 msgid "Invalid password"
 msgstr "Parolayı Değiştir"
 
-#: gajim/dialogs.py:3101
-#, fuzzy
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
-msgstr "Odaya girmek için gerekli parola"
+msgstr "Bir parola girmelisiniz."
 
-#: gajim/dialogs.py:3105
-#, fuzzy
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
-msgstr "Bu iletişim kutusunu bir daha _gösterme"
+msgstr "Parolalar uyuşmuyor"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
-#, fuzzy
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
-msgstr "%(nickname)s Girdi"
+msgstr "Bağlantı Giriş Yaptı"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
-#, fuzzy
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
-msgstr "%(nickname)s Çıktı"
+msgstr "Bağlantı Çıkış Yaptı"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Yeni Mesaj"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
-#, fuzzy
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
-msgstr "Tek Bir İleti Gönder…"
+msgstr "Yeni Tek İleti"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Yeni kişisel Mesaj"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Yeni E-mail"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
-#, fuzzy
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
-msgstr "Dosya Gönderme Soru"
+msgstr "Dosya Gönderim İsteği"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Dosya okunurken hata:"
+msgstr "Dosya Gönderim Hatası"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
-#, fuzzy
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
-msgstr "Dosya Gönderme Tamamlandı"
+msgstr "Dosya Gönderimi Tamamlandı"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
-#, fuzzy
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
-msgstr "Dosya Gönderme Tamamlandı"
+msgstr "Dosya Gönderimi Durduruldu"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
-#, fuzzy
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
-msgstr "Sadece davetliler"
+msgstr "Grup Sohbeti Daveti"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
-#, fuzzy
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
-msgstr "%(nick)s Durumu değiştirdi"
+msgstr "Bağlantı Durumunu Değiştirdi"
 
-#: gajim/dialogs.py:3371
-#, fuzzy, python-format
+#: gajim/dialogs.py:3374
+#, python-format
 msgid "Single Message using account %s"
-msgstr "tek duyarlıklı hesap"
+msgstr "%s Hesabını Kullanarak Tekli Mesaj"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Ileti cevap da içerilsin mi?"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 #, fuzzy
 msgid "Single Message"
 msgstr "Tek Bir İleti Gönder…"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Gönder %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Alındı %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Form"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 #, fuzzy
 msgid "Connection not available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, fuzzy, python-format
 msgid "RE: %s"
 msgstr "Adı _değiştir"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, fuzzy, python-format
 msgid "%s wrote:\n"
 msgstr "Yazıldı: %s\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Temizleniyor"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Filtre:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "ses girdisi"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Gönder"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "ekle"
 
-#: gajim/dialogs.py:3752
-#, fuzzy
+#: gajim/dialogs.py:3755
 msgid "modify"
-msgstr "~Düzenle"
+msgstr "düzenle"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "kaldır"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr ""
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Ekle"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
-#, fuzzy
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Düzenle"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Sil"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Gruplar"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "Kişileri eşzamana getir"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "Kişileri eşzamana getir"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Your Archiving Preferences have been saved!"
 msgstr ""
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Hata"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber kimliği"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Sohbet için Hazır"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 #, fuzzy
 msgid "Privacy List"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "  Etiket     Tip                          İsim/Değer\n"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Desteklenmeyen eylem '%s'"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Kural ekle</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Kural ekle</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Kişisel Gizlilik Listesini biçimle"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Geçersiz Liste İsmi"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr ""
 "Şuraya bir yorum gönderiyorsunuz:\n"
 "  "
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, fuzzy, python-format
 msgid "Comment: %s"
 msgstr "Yorum:"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s grupu kişi listesinden silmek istiyor musun?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr ""
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr ""
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Ses seç"
 
-#: gajim/dialogs.py:4811
-#, fuzzy
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
-msgstr "Sesi Kapat"
+msgstr "Wav Sesleri"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Resim seç"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Resimler"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 #, fuzzy
 msgid "Choose Archive"
 msgstr "Resim seç"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 #, fuzzy
 msgid "Zip files"
 msgstr "Tüm dosyalar"
 
-#: gajim/dialogs.py:4975
-#, fuzzy, python-format
+#: gajim/dialogs.py:4978
+#, python-format
 msgid "When %s becomes:"
-msgstr "ben burdaysam"
+msgstr "%s olduğunda:"
 
-#: gajim/dialogs.py:4977
-#, fuzzy, python-format
+#: gajim/dialogs.py:4980
+#, python-format
 msgid "Adding Special Notification for %s"
-msgstr "bildiriyi beklemeyi durdur"
+msgstr "%s için Özel Bilgilendirme Ekleniyor"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "bir ses ve video"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "bir ses"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "bir video"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "%s hesapına"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1717,443 +1777,481 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Dosya Aktarımları"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "  Spam engelleme etkin değil\n"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+msgid "HTTP File Upload not supported by your server"
+msgstr ""
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Konuk Değiştiriliyor"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 #, fuzzy
 msgid "Please specify the new subject:"
 msgstr "Lütfen kendiniz için yeni bir takma ad belirtin."
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Takma Ad Ayarla"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Geçersiz grup sohbet Jabber kimliği"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 msgid "The group chat JID has not allowed characters."
 msgstr ""
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Takma Ad girdir"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 #, fuzzy
 msgid "and authenticated"
 msgstr "bir ses ve video"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
-#, fuzzy
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
-msgstr "Rahatsız etmeyin"
+msgstr "ve YETKİLENDİRİLMEMİŞ"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Sohbet"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Devam edilen sohbet"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "Değerin maskenin sğında fazladan bitler var."
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr ""
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 msgid "Room is now fully anonymous"
 msgstr ""
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr ""
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 #, fuzzy
 msgid "Room logging is enabled"
 msgstr "Konumlaştırma kapalıdır."
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Adınızı %s olarak değiştirdiniz"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr ""
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "üyelik değişti"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "sistem kapanıyor"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, fuzzy, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "Öntanımlı veritabanı dil kodlaması %s olarak ayarlandı.\n"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s ayrıldı"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr ""
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr ""
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr ""
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Dosya Aktarımları"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Dosya Gönderme Tamamlandı"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr ""
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
 msgstr ""
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, fuzzy, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "Sohbet durum haberleri _göster:"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 #, fuzzy
 msgid "Session negotiation cancelled"
 msgstr "Kullanıcı vazgeçti"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr ""
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 #, fuzzy
 msgid "This session WILL NOT be archived on server"
 msgstr "%s: OID (-o) 0 olamaz\n"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "      --ssl         ssl ile şifrelenmiş oturumu etkinleştir\n"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "bir ses ve video"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "%s: OID (-o) 0 olamaz\n"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "  Spam engelleme etkin değil\n"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\"den yeni bir ileti aldın"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
 "%(message)s"
-msgstr "iletinin konusu"
+msgstr ""
+"Konu: %(subject)lar\n"
+"%(message)lar"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "Dosya Aktarımları"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "%1 (boyut %2)"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr ""
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "_Katıl"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Dosya açılırken hata"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 #, fuzzy
 msgid "Merged accounts"
 msgstr "Hesapları bir_leştir"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Grup sohbetler"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Taşıma"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 #, fuzzy
 msgid "Subscription request has been sent"
 msgstr "Onay e-postası gönderildi."
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Yeni bir oda yaratılmıştır"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG kullanılmiyor"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2161,415 +2259,415 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 #, fuzzy
 msgid "desync'ed"
 msgstr "-e  --ed  Bir ed betiği çıktılar."
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Gajim'den gerçekten çıkılsın mı?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Gajimi her zaman kapat"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 #, fuzzy
 msgid "You have running file transfers"
 msgstr "%s size bir dosya göndermek istiyor:"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "Okunmamış iletler var"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr ""
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, fuzzy, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "%d paket kaldırılacak\n"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "%d paket kaldırılacak\n"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr ""
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Kişiyi yeniden adlandır"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Bu kişi için %s yeni bir takma ad girin."
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Grupu yeniden adlandır"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Grup %s için yeni isim giriniz: "
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Grubu Sil"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "%s grupu kişi listesinden silmek istiyor musun?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Bide bütün grupdaki kişileri listeden sil"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 #, fuzzy
 msgid "Assign OpenPGP Key"
 msgstr "Hiçbir anahtar seçilmedi"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Sesi kapatmak için bir tuş seçin."
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kişi listesinden silincek"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
 "always seeing you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Devam etmek istiyor musunuz?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in them always seeing you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Silindikten sonra bu kişi benim durumu bilsin"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "\"%s\" kişi listesinden silincek"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then they will see your global status."
 msgstr ""
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Hiç bir hesap bulunmiyor"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several XMPP accounts or transport accounts."
 msgstr ""
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Adres verilmedi"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Yapmak istediğiniz şey bu mu?"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Bunu %s buna %s gönder"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "bir ses ve video"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "bir ses ve video"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "Durum ileti değiştir"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 #, fuzzy
 msgid "Publish Tune"
 msgstr "Albüm Ayarı"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 #, fuzzy
 msgid "Publish Location"
 msgstr " B - DosyaKilidi konumu"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Çevrimiçi Servisler"
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 #, fuzzy
 msgid "_Maximize All"
 msgstr "Bütün durumlar"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "grupdaki herkez"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Tüm kullanıcılara"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Tüm çevredeki kullanıcılara"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "Buna davet _et"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Kişisel ilanlar sayfayı yazımla"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "_Kaldır"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 #, fuzzy
 msgid "_Maximize"
 msgstr "Ekranı kapla"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Yeniden bağlan"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "Bağlantıyı _kes"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Geçmiş"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 #, fuzzy
 msgid "History Manager"
 msgstr "Paket Yöneticisi"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "Yeni grup sohbete _katıl"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "Durum ileti değiştir"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 msgid "Show the application's version"
 msgstr ""
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Kişi listesindeki olayları göster"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "İlerlemiş Ayarlama Editörü"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Hata açıklaması…"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Bütün Bekleyen _Olayları Göster"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 #, fuzzy
 msgid "Database Error"
 msgstr "Hata açıklaması…"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Ne yapmak istiyorsun?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connecting"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, python-format
 msgid "%(received)s of %(max)s"
 msgstr ""
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Okunmamış iletler var"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2578,7 +2676,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2586,7 +2684,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2653,20 +2751,20 @@ msgid "Nick"
 msgstr "Takma Ad"
 
 #: gajim/config.py:1654
-#, fuzzy
 msgid "Role"
-msgstr "<b>rol:</b>"
+msgstr "Rol"
 
 #: gajim/config.py:1680
 msgid "Banning…"
 msgstr ""
 
 #: gajim/config.py:1682
-#, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
-msgstr "%s grupu kişi listesinden silmek istiyor musun?"
+msgstr ""
+"<b>Kimi kovmak istiyorsunuz?</b>\n"
+"\n"
 
 #: gajim/config.py:1684
 #, fuzzy
@@ -2725,17 +2823,17 @@ msgstr "Dosya boş"
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 #, fuzzy
 msgid "Password Required"
 msgstr "Şifre gerekli"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, fuzzy, python-format
 msgid "Enter your password for account %s"
 msgstr "Gadu-Gudu hesabı için parola değiştir"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 #, fuzzy
 msgid "Save password"
 msgstr "Parolayı Değiştir"
@@ -2771,11 +2869,21 @@ msgstr "Gruptan kullanıcı çıkart:"
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
+#: gajim/config.py:1947
+#, fuzzy
+msgid "?print_status:All"
+msgstr "grupdaki herkez"
+
 #: gajim/config.py:1948
 #, fuzzy
 msgid "Enter and leave only"
 msgstr "ve 'boşluk' ya da 'enter' tuşuna bas."
 
+#: gajim/config.py:1949
+#, fuzzy
+msgid "?print_status:None"
+msgstr "Durumu a_yarla"
+
 #: gajim/config.py:2015
 #, fuzzy
 msgid "New Group Chat"
@@ -2842,12 +2950,12 @@ msgstr "Geçersiz takma ad"
 msgid "Custom port must be a port number."
 msgstr "url portu bir sayı olmalı\n"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Dosyası zaten var"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2955,95 +3063,118 @@ msgstr "%s grup sohbete katıldı"
 msgid "Group Chat Message Received"
 msgstr "%s grup sohbete katıldı"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Hiç biri"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Üye"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Yönetici"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Sahibi"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 #, fuzzy
 msgid " [blocked]"
 msgstr "Engellenmiş"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 #, fuzzy
 msgid " [minimized]"
 msgstr "Küçültülmüş"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "Bağlantılı"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Bağlantızıs"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Yükleme"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Gönder"
+
+#: gajim/tooltips.py:660
 #, fuzzy
 msgid "Type: "
 msgstr "_Türü:"
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 #, fuzzy
 msgid "Transferred: "
 msgstr "%d bayt aktarıldı"
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Başlatılmadı"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Durduruldu"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Tamamlanıldı"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:Duraklanıldı"
+
+#: gajim/tooltips.py:682
 #, fuzzy
 msgid "Stalled"
 msgstr " [ %i%% ] (askıda)"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Transfer ediliyor"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Durum:"
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+#, fuzzy
+msgid "?user status:Available"
+msgstr "?transfer status:Duraklanıldı"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Sohbet için Hazır"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Uzakta"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Meşgul"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Mevcut Değil"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Bağlı değil"
 
@@ -3076,19 +3207,16 @@ msgid "Color"
 msgstr "Renk"
 
 #: gajim/advanced_configuration_window.py:104
-#, fuzzy
 msgid "Preference Name"
-msgstr "İlk Ad:"
+msgstr "Tercih Adı"
 
 #: gajim/advanced_configuration_window.py:111
-#, fuzzy
 msgid "Value"
-msgstr "anahtar=değer"
+msgstr "Değer"
 
 #: gajim/advanced_configuration_window.py:120
-#, fuzzy
 msgid "Type"
-msgstr "_Türü:"
+msgstr "Tip"
 
 #: gajim/advanced_configuration_window.py:176
 msgid "(None)"
@@ -3098,125 +3226,129 @@ msgstr "(Hiçbiri)"
 msgid "Hidden"
 msgstr "Gizli"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, fuzzy, python-format
 msgid "Conversation History with %s"
 msgstr "Beni bir açılan pencereyle _haberle"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Sohbet Kayıtları"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 #, fuzzy
 msgid "Disk Error"
 msgstr "Hata açıklaması…"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Hata: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Hata"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "%(nick)s durumu şimdi %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Konu: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "Durum ileti değiştir"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "%s hesapı kullanıp"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Yer imlerini işlet"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "<b>Kişi Listesi Görünümü</b>"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Kişi Listesini Göster"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Menüyi gizle"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 #, fuzzy
 msgid "Unable to load image"
 msgstr "Yüklenecek Lua arayüz modülü"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, fuzzy, python-format
 msgid "Media type not supported: %s"
 msgstr "Rahatsız etmeyin"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr ""
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "yeni@jabber.kimliği"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "yeni%d@jabber.kimliği"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "_Bilgisayar adı:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "MUC sunucusu"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3250,14 +3382,12 @@ msgid "Service Discovery using account %s"
 msgstr ""
 
 #: gajim/disco.py:628
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Avahi Keşif"
+msgstr "Hizmet Keşfi"
 
 #: gajim/disco.py:732
-#, fuzzy
 msgid "The service could not be found"
-msgstr "Paket bulunamadı"
+msgstr "Hizmet bulunamadı"
 
 #: gajim/disco.py:733
 msgid ""
@@ -3266,18 +3396,16 @@ msgid ""
 msgstr ""
 
 #: gajim/disco.py:739 gajim/disco.py:1091
-#, fuzzy
 msgid "The service is not browsable"
-msgstr "Klasör \"%s\" yazılabilir değil"
+msgstr "Bu hizmet gözatılabilir değil"
 
 #: gajim/disco.py:740
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 
 #: gajim/disco.py:781 gajim/disco.py:791
-#, fuzzy
 msgid "Invalid Server Name"
-msgstr "Geçersiz Liste İsmi"
+msgstr "Geçersiz Sunucu Adı"
 
 #: gajim/disco.py:849
 #, python-format
@@ -3301,7 +3429,7 @@ msgstr "Komuta _Yürüt"
 #: gajim/disco.py:1308 gajim/disco.py:1465
 #, fuzzy
 msgid "Re_gister"
-msgstr "Adı _değiştir"
+msgstr "_Kaydol"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
 #: gajim/data/gui/join_groupchat_window.ui:325
@@ -3376,61 +3504,67 @@ msgstr "_Üye yap"
 msgid "_Unsubscribe"
 msgstr "_Üyelikten çık"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr ""
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 #, fuzzy
 msgid "_Quote"
 msgstr "Alıntı"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "%s hesapına"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 #, fuzzy
 msgid "Read _Wikipedia Article"
 msgstr "Makale okunmuş"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr ""
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr ""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 #, fuzzy
 msgid "Web _Search for it"
 msgstr "Olaylamak için bir daha tuşla:"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Dosya Farklı Kaydet..."
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Yerel jid:"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3441,32 +3575,36 @@ msgstr[0] ""
 msgid "Write a message.."
 msgstr "Ileti alınıyor"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr ""
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Tüm yer imlerini kaldırmak istediğinizden emin misiniz?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Grup Sohbetler"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Kişisel Sohbetler"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "İletler"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
-#, fuzzy
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
-msgstr "Grup eklenemedi: grup zaten var"
+msgstr "Grup sohbetine girilemiyor"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3475,275 +3613,280 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Ricayı kabul ediyor musunuz?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr ""
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Bağlantı Kurulamıyor"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Yazıtipi</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr ""
 "Şuraya bir yorum gönderiyorsunuz:\n"
 "  "
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "grup %s yok - root kullanılacak\n"
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "grup %s yok - root kullanılacak\n"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "grup %s yok - root kullanılacak\n"
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Grup eklenemedi: grup zaten var"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr ""
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr ""
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Hata %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Kişisel ilet gönderimi başarısız"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Üyelik isteği"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "İzlemci"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 #, fuzzy
 msgid "Authorization accepted"
 msgstr "Değer kabul edildi!"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, fuzzy, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kişi listesinden silincek"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "Üyelikten çıkarıldı"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, fuzzy, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "işlem 'pmuls' ile birleştirilemez"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr ""
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 msgstr ""
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr ""
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Yanlış Şifre"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Yanlış Şifre"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Gadu-Gudu hesabı için parola değiştir"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr ""
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s size bir dosya göndermek istiyor."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 #, fuzzy
 msgid "SSL certificate error"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Dosya Gönderme Tamamlandı"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr ""
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, fuzzy, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Gönderdiğiniz iletide yazacak adın rengi."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Gönderdiğiniz iletide yazacak adın rengi."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "%s size bir dosya göndermek istiyor:"
+
+#: gajim/gui_interface.py:1196
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Mesaj ayrıştırılamıyor"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Kullanan ad Çarpışması"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr ""
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Kaynak Çarpışması"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr ""
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Dosya Gönderme Soru"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 #, fuzzy
 msgid "Error verifying SSL certificate"
 msgstr "      --sslcert     ssl istemci sertifikası\n"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3751,7 +3894,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3763,16 +3906,16 @@ msgstr ""
 "Bu doğruluk belgeyi bilinen doğruluk belgelere kat.\n"
 "SHA1 doğruluk belgenin parmakizi:\n"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 #, fuzzy
 msgid "Ignore this error for this certificate."
 msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3787,46 +3930,46 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr ""
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "%s mevcut bir grubun ismi değil"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Devre dışı bırakılmış rule'lar:"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "%s mevcut bir grubun ismi değil"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3834,41 +3977,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "öntanımlı"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Şifre gerekli"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Yanlış Şifre"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 
@@ -3946,6 +4089,11 @@ msgstr "<b>Önceden hazırlanmış Durum İletleri</b>"
 msgid "- messages will not be logged"
 msgstr "Iletiler yazdırılımadı"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP:"
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3980,14 +4128,14 @@ msgstr "Geçersiz oda"
 msgid "The form is not filled correctly."
 msgstr "%s: Kontrol karakterleri kullanılamaz.\n"
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Görünmez"
 
 #: gajim/dialog_messages.py:68
 #, fuzzy
 msgid "A connection is not available"
-msgstr "Klasör \"%s\" yazılabilir değil"
+msgstr "Bir bağlantı kullanılabilir değil"
 
 #: gajim/dialog_messages.py:69
 #, fuzzy
@@ -4036,14 +4184,13 @@ msgid ""
 msgstr ""
 
 #: gajim/dialog_messages.py:96
-#, fuzzy
 msgid "Invisibility not supported"
-msgstr "Rahatsız etmeyin"
+msgstr "Görünmezlik desteklenmiyor"
 
 #: gajim/dialog_messages.py:97
-#, fuzzy, python-format
+#, python-format
 msgid "Account %s doesn't support invisibility."
-msgstr "Dalga %s biçimini desteklemiyor..."
+msgstr "%s hesabı görünmezliği desteklemiyor."
 
 #: gajim/dialog_messages.py:101
 #, fuzzy
@@ -4063,12 +4210,11 @@ msgstr "Onay başarılı oldu."
 #: gajim/dialog_messages.py:107
 #, fuzzy, python-format
 msgid "Registration with agent %s succeeded"
-msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
+msgstr "%s ajanı ile kayıt başarılı"
 
 #: gajim/dialog_messages.py:111
-#, fuzzy
 msgid "Registration failed"
-msgstr "Bağlantı Kurulamıyor"
+msgstr "Kayıt başarısız"
 
 #: gajim/dialog_messages.py:112
 #, python-format
@@ -4113,6 +4259,56 @@ msgid ""
 "Link-local messaging might not work properly."
 msgstr ""
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "%s: \"%s\" servisi başlatılamadı: Hata kodu %d\n"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Resim acılamadı"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "<b>Bir hata oluştu:</b>"
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Resim acılamadı"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "Bir bağlantı kullanılabilir değil"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Temalar"
@@ -4138,7 +4334,17 @@ msgstr ""
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Hesapları bir_leştir"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "G_PG acenta kullan"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 #, fuzzy
 msgid "Be right back."
 msgstr "Hemen Dönecek"
@@ -4161,6 +4367,11 @@ msgstr ""
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "_Kaldır"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4356,275 +4567,300 @@ msgstr "Parolayı Değiştir"
 msgid "Login Options"
 msgstr "Duygu _Simgeler:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Belirtilen komutla ilgili yardımı gösterir"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "komut"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "komut yardımını göster"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr ""
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "hesap"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "sadece bu hesapın kişilerini göster"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Durum satırı okunamadı"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "durum"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr ""
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "mesaj"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "durum ileti"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr ""
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 msgid "Changes the priority of account(s)"
 msgstr ""
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "öncelik"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr ""
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
 msgstr ""
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 msgstr ""
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "iletinin içindekiler"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
 "and account. If you want to only set the latter, set OpenPGP key to \"\"."
 msgstr ""
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "konu"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "iletinin konusu"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr ""
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "Kişinin JIDsi"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr ""
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Hesapın ismi"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Dosyayı bir kişiye gönderir"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "dosya"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Dosya yolu"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr ""
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "'key'in değerini 'value' değere kurar"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "anahtar=değer"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 #, fuzzy
 msgid "Deletes a preference item"
 msgstr "Günün İletisini Sil"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "anahtar"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 #, fuzzy
 msgid "name of the preference to be deleted"
 msgstr "Lütfen eklemek istediğiniz grubun adını girin."
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Kişiyi listeden sil"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Kaç okunmamış ileti sayısını geri ver"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Özel XML gönder"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "gönderilenecek XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Avatarı değiştir"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Kullanılacak resim"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Paket sisteminin kilitli olup olmadığını kontrol edin."
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr ""
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 #, fuzzy
 msgid "Missing argument \"contact_jid\""
 msgstr "JID veya Kişi adı girdir"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 #, fuzzy
 msgid "You have no active account"
 msgstr "Bir hesap seçmek zorundasınız."
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, fuzzy, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4633,16 +4869,16 @@ msgstr ""
 "Kullanım: %s [komut satır yordamları reddedildi]\n"
 "  veya:  %s OPTION\n"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Argümanlar:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s bulunamadı"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4651,14 +4887,14 @@ msgid ""
 "Command is one of:\n"
 msgstr ""
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4836,11 +5072,6 @@ msgstr "Ayrıştırmayı bitir"
 msgid "Weekend!"
 msgstr "Hafta sonu!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP hesabı %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4849,66 +5080,65 @@ msgid ""
 msgstr ""
 
 #: gajim/common/connection_handlers_events.py:877
-#, fuzzy, python-format
+#, python-format
 msgid "unsubscribe request from %s"
-msgstr "Dosya Gönderme Soru"
+msgstr "%s tarafından abonelikten çıkma isteği"
 
 #: gajim/common/connection_handlers_events.py:977
-#, fuzzy
 msgid "Room has been destroyed"
-msgstr "Yeni bir oda yaratılmıştır"
+msgstr "Oda imha edildi"
 
 #: gajim/common/connection_handlers_events.py:985
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "<b>Bir hata oluştu:</b>"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "\"%s\"den yeni bir ileti aldın"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "%(nickname)s yazdı"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "%(nickname)s den Yeni İlet alındı"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Durumu değiştirdi"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 #, fuzzy
 msgid "Not in roster"
 msgstr "Kişi listesindeki olayları göster"
@@ -5605,30 +5835,28 @@ msgstr ""
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
@@ -5636,259 +5864,269 @@ msgstr ""
 "Bunu işaretleyince Gajim göndermeden sorar parolayı tehlikeli bir bağlantı "
 "üzerinden göndersin mi diye."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 #, fuzzy
 msgid "Whitespace sent after inactivity"
 msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr ""
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 #, fuzzy
 msgid "Jabberd2 workaround"
 msgstr "Bug'ları hallet"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 #, fuzzy
 msgid "Answer to receipt requests"
 msgstr "matematik probleminin yanıtını yaz"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 #, fuzzy
 msgid "Sent receipt requests"
 msgstr "     İsteklerin gideceği adres: %(requestaddr)s"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s size bir dosya göndermek istiyor."
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr ""
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Kimliksiz kimlik doğrulaması"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "Kimliksiz kimlik doğrulaması"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "Kimliksiz kimlik doğrulaması"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr ""
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 #, fuzzy
 msgid "Sleeping"
 msgstr "Uyuyan bir kapibara."
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 #, fuzzy
 msgid "Back soon"
 msgstr "Geri Düğme"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 #, fuzzy
 msgid "Back in some minutes."
 msgstr "Bekleme süresi (dakikalar)"
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Yemelik"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Yemek yiyorum, bu yüzden bana bir mesaj brak."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Filim"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Bir filim bakiyorum."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr " Çalışılıyor"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr " Çalışılıyorum"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Telefon"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Telefondayım"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Dış"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 #, fuzzy
 msgid "I'm available."
 msgstr "Mevcut Değil"
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Sohbet için Hazırım"
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 #, fuzzy
 msgid "I'm not available."
 msgstr "Mevcut Değil"
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Rahatsız Etme."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Güle Güle!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "yeşil"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "bakkal"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "insan"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "denizcilik"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "Kime"
@@ -5922,9 +6160,8 @@ msgid "Do not disturb"
 msgstr "Rahatsız etmeyin"
 
 #: gajim/common/commands.py:120
-#, fuzzy
 msgid "Offline - disconnect"
-msgstr "çevrimdışı"
+msgstr "Çevrimdışı - bağlantıyı kes"
 
 #: gajim/common/commands.py:125
 #, fuzzy
@@ -5975,39 +6212,52 @@ msgstr ""
 msgid "Forward unread message then disconnect"
 msgstr "Okunmamış iletler var"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Dosya boş"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Dosya mevcut değil"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 #, fuzzy
 msgid "creating logs database"
 msgstr "%s/base/1 içinde template1 veritabanı yaratılıyor. "
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 #, fuzzy
 msgid "creating cache database"
 msgstr "%s/base/1 içinde template1 veritabanı yaratılıyor. "
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Bunu %s buna %s gönder"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr ""
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 #, fuzzy
 msgid "Gajim will now exit"
 msgstr "Gajim'den gerçekten çıkılsın mı?"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr ""
@@ -6017,12 +6267,12 @@ msgstr ""
 msgid "Error: cannot open %s for reading"
 msgstr "Hata: %s okumak için açılamıyor"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 #, fuzzy
 msgid "cyan"
 msgstr "turkuaz"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -6031,259 +6281,262 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr "Klasör \"%s\" yazılabilir değil"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 #, fuzzy
 msgid "Unable to get issuer certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 #, fuzzy
 msgid "Unable to get certificate CRL"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 #, fuzzy
 msgid "Unable to decrypt certificate's signature"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Hata: Yanlış imza"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 #, fuzzy
 msgid "CRL signature failure"
 msgstr "Hata: Yanlış imza"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 #, fuzzy
 msgid "Certificate is not yet valid"
 msgstr "Sertifika henüz geçerli değil"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "Sertifika henüz geçerli değil"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 #, fuzzy
 msgid "CRL has expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 #, fuzzy
 msgid "Out of memory"
 msgstr "%(nickname)s Çıktı"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 #, fuzzy
 msgid "Self signed certificate"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 #, fuzzy
 msgid "Self signed certificate in certificate chain"
 msgstr "öz-imzalı sertifika KÖTÜ bir imzaya sahip"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 #, fuzzy
 msgid "Unable to get local issuer certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 #, fuzzy
 msgid "Unable to verify the first certificate"
 msgstr "başlangıç dizini belirlenemedi"
 
-#: gajim/common/connection.py:98
-#, fuzzy
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
-msgstr "sertifika zinciri çok uzun\n"
+msgstr "Sertifika zinciri çok uzun"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 #, fuzzy
 msgid "Certificate revoked"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Geçersiz Jabber kimliği"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 #, fuzzy
 msgid "Path length constraint exceeded"
 msgstr "Kağıt Uçağın Gideceği Yol Uzunluğu"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 #, fuzzy
 msgid "Unsupported certificate purpose"
 msgstr "Sertifika doğrulama hatası (%s)"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 #, fuzzy
 msgid "Certificate not trusted"
 msgstr "GPG anahtara güvenilmiyor"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "^Rededilmiş durumunu değiştir"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 #, fuzzy
 msgid "Subject issuer mismatch"
 msgstr "ifade yığıtı uyumsuzluğu"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 #, fuzzy
 msgid "Application verification failure"
 msgstr "'%s' çözülürken geçici bozukluk"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 #, fuzzy
 msgid "Reconnect manually."
 msgstr "_Elle gir"
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Resim acılamadı"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Resim acılamadı"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "MUC sunucusu"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "\"%s\" veritabanına bağlantı başarısız oldu: %s"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "%s: %s veritabanına bağlanılamadı\n"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "sertifika elde edilemedi: %s\n"
 
-#: gajim/common/connection.py:1366
-#, fuzzy, python-format
+#: gajim/common/connection.py:1369
+#, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
-msgstr "Hata açıklaması…"
+msgstr ""
+"\n"
+"SSL Hatası: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
-#, fuzzy, python-format
+#: gajim/common/connection.py:1371
+#, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
-msgstr "<b>Bir hata oluştu:</b>"
+msgstr ""
+"\n"
+"Bilinmeyen SSL hatası: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "sertifika elde edilemedi: %s\n"
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, fuzzy, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Resim acılamadı"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, fuzzy, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Kimliksiz kimlik doğrulaması"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr ""
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Kişinin bağlantısı kesildi"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kişileri eşzamana getir"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6830,32 +7083,28 @@ msgid "Grooming"
 msgstr "Tımarlamada"
 
 #: gajim/common/pep.py:143
-#, fuzzy
 msgid "At the Spa"
-msgstr " \"%s\" portunda"
+msgstr "Spa'da"
 
 #: gajim/common/pep.py:144
 msgid "Brushing Teeth"
 msgstr "Diş furçalamada"
 
 #: gajim/common/pep.py:145
-#, fuzzy
 msgid "Getting a Haircut"
-msgstr "Başlıklar alınıyor"
+msgstr "Berberde"
 
 #: gajim/common/pep.py:146
 msgid "Shaving"
 msgstr "Traşda"
 
 #: gajim/common/pep.py:147
-#, fuzzy
 msgid "Taking a Bath"
-msgstr "gecicinin adresi alıniyor"
+msgstr "Banyo yapıyor"
 
 #: gajim/common/pep.py:148
-#, fuzzy
 msgid "Taking a Shower"
-msgstr "gecicinin adresi alıniyor"
+msgstr "Duş alıyor"
 
 #: gajim/common/pep.py:149
 msgid "Having an Appointment"
@@ -6980,9 +7229,8 @@ msgid "Commuting"
 msgstr "Değiştircede"
 
 #: gajim/common/pep.py:179
-#, fuzzy
 msgid "Driving"
-msgstr "Sürülüm:"
+msgstr "Araba sürüyor"
 
 #: gajim/common/pep.py:180
 #, fuzzy
@@ -7000,9 +7248,8 @@ msgid "On a Plane"
 msgstr "Telefondayım"
 
 #: gajim/common/pep.py:183
-#, fuzzy
 msgid "On a Train"
-msgstr "Telefondayım"
+msgstr "Trende"
 
 #: gajim/common/pep.py:184
 #, fuzzy
@@ -7010,9 +7257,8 @@ msgid "On a Trip"
 msgstr "Telefondayım"
 
 #: gajim/common/pep.py:185
-#, fuzzy
 msgid "Walking"
-msgstr "Ağaçta gezinme başarısız"
+msgstr "Yürüyor"
 
 #: gajim/common/pep.py:187
 msgid "Coding"
@@ -7129,19 +7375,16 @@ msgid "uri"
 msgstr "uri"
 
 #: gajim/common/pep.py:343
-#, fuzzy
 msgid "Unknown Artist"
-msgstr "?Client:Bilinmez"
+msgstr "Bilinmeyen Sanatçı"
 
 #: gajim/common/pep.py:346
-#, fuzzy
 msgid "Unknown Title"
-msgstr "?Client:Bilinmez"
+msgstr "Bilinmeyen Parça"
 
 #: gajim/common/pep.py:349
-#, fuzzy
 msgid "Unknown Source"
-msgstr "?Client:Bilinmez"
+msgstr "Bilinmeyen Kaynak"
 
 #: gajim/common/pep.py:352
 #, python-format
@@ -7189,258 +7432,283 @@ msgstr "video girdisi"
 msgid "video output"
 msgstr "video çıktısı"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 #, fuzzy
 msgid "Invalid character in hostname."
 msgstr "İpucunda geçersiz %s karakteri"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 #, fuzzy
 msgid "Server address required."
 msgstr "<b>Lütfen sunucu seçiniz</b>"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 #, fuzzy
 msgid "Invalid character in username."
 msgstr "İpucunda geçersiz %s karakteri"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr ""
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 #, fuzzy
 msgid "Invalid character in resource."
 msgstr "İpucunda geçersiz %s karakteri"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Meşgul"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Mevcut Değil"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "Sohbet için _Hazır"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+#, fuzzy
+msgid "?user status:_Available"
+msgstr "?transfer status:Duraklanıldı"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Connecting"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "_Uzakta"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "Bağlı _değil"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "Görünmez"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?contact has status:Bilinmez"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?contact has status:Hatalı"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Hiç biri"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "Kime"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Gönderen"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "İkisi de"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Hiç biri"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Üye yap"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Hiç biri"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Moderatör"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Moderatör"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Katılanlar"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Katılan"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Ziyaretçiler"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Ziyaretçi"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "sobete dikkat veriyor"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "başka bir şey yapıyor"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "ilet yazıyor…"
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "ilet yazarken durdu"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr ""
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Ileti alınıyor"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " gönderen oda %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " gönderen kişi %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " gönderen %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, fuzzy, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "Kişi listesindeki olayları göster"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Seni kişi listeme eklemek isterdim"
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "Merhaba, benim adım $name."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Resimi Farklı Kaydet..."
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Resim çok büyük"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "Sertifika henüz geçerli değil"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "Resimi Farklı Kaydet..."
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "mesaj"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Seni benim kişi listeye eklemek isterdim"
 
@@ -7470,47 +7738,47 @@ msgid ""
 "Try reading %(url)s"
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 #, fuzzy
 msgid "Could not start local service"
 msgstr "%s: \"%s\" servisi başlatılamadı: Hata kodu %d\n"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "PORT komutu gönderilemiyor"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Durum satırı okunamadı"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr ""
 "İleti gönderilmemiş olabilir çünkü görünmez iken yollamaya izin verilmiyor:"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 #, fuzzy
 msgid "Contact is offline. Your message could not be sent."
 msgstr "İleti gönderilmemiş olabilir çünkü kullanıcı çevrimdışı:"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7679,9 +7947,8 @@ msgstr "Sohbet kayıtı _kaydet"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:360
-#, fuzzy
 msgid "Contact"
-msgstr "kişi(ler)"
+msgstr "Bağlantı"
 
 #: gajim/data/gui/zeroconf_information_window.ui:234
 msgid "First Name:"
@@ -7754,6 +8021,11 @@ msgstr ""
 msgid "_Add to Roster"
 msgstr "Kişi listeye _ekle…"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "Komuta _Yürüt"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -7896,9 +8168,8 @@ msgstr "<b>Ayle:</b>"
 #. Given Name
 #: gajim/data/gui/profile_window.ui:118
 #: gajim/data/gui/vcard_information_window.ui:822
-#, fuzzy
 msgid "<b>Given:</b>"
-msgstr "Adres verilmedi"
+msgstr "<b>Verilmiş:</b>"
 
 #. Middle Name
 #: gajim/data/gui/profile_window.ui:142
@@ -7909,16 +8180,14 @@ msgstr "<b>Orta:</b>"
 #. Prefix in Name
 #: gajim/data/gui/profile_window.ui:156
 #: gajim/data/gui/vcard_information_window.ui:766
-#, fuzzy
 msgid "<b>Prefix:</b>"
-msgstr "Önek"
+msgstr "<b>Ön ek:</b>"
 
 #. Suffix in Name
 #: gajim/data/gui/profile_window.ui:190
 #: gajim/data/gui/vcard_information_window.ui:835
-#, fuzzy
 msgid "<b>Suffix:</b>"
-msgstr "B<-s, --suffix >I<STRING>"
+msgstr "<b>Son ek:</b>"
 
 #: gajim/data/gui/profile_window.ui:222
 #: gajim/data/gui/vcard_information_window.ui:878
@@ -8021,9 +8290,8 @@ msgstr "<b>Departman:</b>"
 
 #: gajim/data/gui/profile_window.ui:665
 #: gajim/data/gui/vcard_information_window.ui:1018
-#, fuzzy
 msgid "<b>Position:</b>"
-msgstr "<b>Konum</b>"
+msgstr "<b>Konum:</b>"
 
 #: gajim/data/gui/profile_window.ui:689
 #: gajim/data/gui/vcard_information_window.ui:1045
@@ -8048,11 +8316,11 @@ msgstr "Hakkında"
 msgid "Con_tinue"
 msgstr "_Devam"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "_Durakla"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_İptal"
@@ -8062,63 +8330,67 @@ msgstr "_İptal"
 msgid "_Open Containing Folder"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Dosya Aktarımları"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "dosya aktarımların listesi"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Bir çalışan, tamamlanmış ile durdurulmuş dosya aktarma listesi"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Temizle"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Dosya aktarımları listeden sil."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Seçilmiş dosya aktarımı iptal ediyor"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Dosya transferi iptal et"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Seçilmiş dosya aktarımı iptal ediyor"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Gönder & Kapat"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Pencereyi gizler"
 
-#: gajim/data/gui/filetransfers.ui:228
-#, fuzzy
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
-msgstr "_Dosya aktarımı tamamlandığında beni uyar"
+msgstr "_Bir dosya aktarımı tamamlandığında beni bilgilendir"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr ""
 
@@ -8128,7 +8400,7 @@ msgid "Register to"
 msgstr "Bunu %s buna %s gönder"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Tamam"
 
@@ -8160,21 +8432,21 @@ msgstr "Yazıtipi"
 msgid "Clear formatting"
 msgstr "Işareti temizle"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr ""
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Parolayı Değiştir"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr ""
+
+#: gajim/data/gui/popup_notification_window.ui:55
 #, fuzzy
 msgid "Event Type"
 msgstr "Olay"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 #, fuzzy
 msgid "Event desc"
 msgstr "Olay"
@@ -8237,7 +8509,7 @@ msgstr "<b>Yazıtipi</b>"
 msgid "<b>#</b>"
 msgstr "<b>Yazıtipi</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -8772,9 +9044,8 @@ msgid "Your message:"
 msgstr "Senin mesajın:"
 
 #: gajim/data/gui/preferences_window.ui:1916
-#, fuzzy
 msgid "_URL highlight:"
-msgstr "Yazım hatalarını _vurgula"
+msgstr "_URL vurgulama:"
 
 #: gajim/data/gui/preferences_window.ui:2041
 #, fuzzy
@@ -8944,10 +9215,6 @@ msgstr "_Aç..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>İlerlemiş Ayarlama Editörü</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "İlerlemiş"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Sohbet _Başla"
@@ -9193,7 +9460,7 @@ msgid "_Open Email Composer"
 msgstr "Gmail Gelen Kutusunu _Aç"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 #, fuzzy
 msgid "_Start Chat"
 msgstr "Sohbet _Başla"
@@ -9240,6 +9507,10 @@ msgstr "Tercihler"
 msgid "Default:"
 msgstr "Öntanımlı"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Yeni Kişi Ekle"
@@ -9265,6 +9536,16 @@ msgstr "_Takma Ad:"
 msgid "_Group:"
 msgstr "_Grup:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Kullanıcı kimliği:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Takma ad"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9295,6 +9576,11 @@ msgid ""
 "to add a contact from this protocol."
 msgstr ""
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "Durum ileti değiştir"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Ruh Hali:</b>"
@@ -9377,9 +9663,8 @@ msgid "to"
 msgstr "kime"
 
 #: gajim/data/gui/privacy_list_window.ui:66
-#, fuzzy
 msgid "<i>Privacy List</i>"
-msgstr "Geçersiz Liste İsmi"
+msgstr "<i>Gizlilik Listesi</i>"
 
 #: gajim/data/gui/privacy_list_window.ui:77
 #, fuzzy
@@ -9392,9 +9677,8 @@ msgid "Active on each startup"
 msgstr "Gajim açılırken bağlan"
 
 #: gajim/data/gui/privacy_list_window.ui:132
-#, fuzzy
 msgid "<b>List of rules</b>"
-msgstr "Geçersiz Liste İsmi"
+msgstr "<b>Kural listesi</b>"
 
 #: gajim/data/gui/privacy_list_window.ui:244
 #, fuzzy
@@ -9530,10 +9814,9 @@ msgstr "<b>Yürütecek komutayı seç</b>"
 msgid "_Verify"
 msgstr "_Doğrula"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Hesaplar"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>EOturum</b> bilgi)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9560,11 +9843,6 @@ msgstr "Sadece _Çecredeki Kişileri Göster"
 msgid "Show Transports"
 msgstr "_XML Konsolu Göster"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Dosya Aktarımları"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9637,48 +9915,33 @@ msgstr "Kendilinden Katılınca Küçült"
 msgid "Pr_int status:"
 msgstr "Durumu göster:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "Açıklama"
+#: gajim/data/gui/exception_dialog.ui:45
+msgid ""
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
+msgstr ""
 
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:115
 #, fuzzy
 msgid "Report Bug"
 msgstr "_Hata Bildir"
 
-#: gajim/data/gui/exception_dialog.ui:89
-msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
-msgstr ""
-
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Üyelik İsteği"
-
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Reddet"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Aktionlar"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 #, fuzzy
 msgid "Au_thorize"
 msgstr "AU ayırıcı"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
 
@@ -9696,26 +9959,31 @@ msgstr ""
 msgid "Presets"
 msgstr "_Bulunma"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Arkadaşları Davet Et!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
 "Select the contacts you want to invite"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Lütfen bir MUC sunucu seç."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "MUC sunucusu"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "Davet _et"
 
@@ -9826,11 +10094,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Temizleniyor"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -9994,6 +10257,15 @@ msgstr "Bütün Bekleyen _Olayları Göster"
 msgid "Mute Sounds"
 msgstr "Sesi Kapat"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Tercihler"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr ""
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Kime:"
@@ -10395,23 +10667,13 @@ msgstr ""
 msgid "Configuration"
 msgstr "Oda Yerleştirme"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
-#, fuzzy
 msgid "Jabber IM Client"
-msgstr "Geçersiz Jabber kimliği"
+msgstr "Jabber IM İstemcisi"
 
 #: data/org.gajim.Gajim.desktop.in:6 data/org.gajim.Gajim.appdata.xml.in:10
-#, fuzzy
 msgid "A GTK+ Jabber client"
-msgstr "Geçersiz Jabber kimliği"
+msgstr "Bir GTK+ Jabber istemcisi"
 
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
@@ -10529,6 +10791,17 @@ msgid "Plugin manager"
 msgstr "Bağlantı Kurulamıyor"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP hesabı %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "Açıklama"
+
+#~ msgid "_Actions"
+#~ msgstr "_Aktionlar"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "Dbus Denetim Altyapısı"
 
@@ -10648,12 +10921,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "Hide all buttons in chat windows"
 #~ msgstr "Konuşma penceresinde tüm düğmeleri gizle"
 
-#~ msgid "File is empty"
-#~ msgstr "Dosya boş"
-
-#~ msgid "File does not exist"
-#~ msgstr "Dosya mevcut değil"
-
 #, fuzzy
 #~ msgid "Disk Write Error"
 #~ msgstr "<b>Bir hata oluştu:</b>"
@@ -10670,60 +10937,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "Python Programlama Dili"
 
 #, fuzzy
-#~ msgid "?user status:_Available"
-#~ msgstr "?transfer status:Duraklanıldı"
-
-#, fuzzy
-#~ msgid "?user status:Available"
-#~ msgstr "?transfer status:Duraklanıldı"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?contact has status:Bilinmez"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?contact has status:Hatalı"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Subscription we already have:Hiç biri"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Ask (for Subscription):Hiç biri"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Group Chat Contact Role:Hiç biri"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Group Chat Contact Affiliation:Hiç biri"
-
-#, fuzzy
-#~ msgid "?print_status:All"
-#~ msgstr "grupdaki herkez"
-
-#, fuzzy
-#~ msgid "?print_status:None"
-#~ msgstr "Durumu a_yarla"
-
-#, fuzzy
-#~ msgid "?features:Available"
-#~ msgstr "Mevcut"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "hesap"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "durum"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "mesaj"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "öncelik"
-
-#, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "oda"
 
@@ -10735,30 +10948,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "?CLI:password"
 #~ msgstr "parola"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Grup Sohbetler"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Yükleme"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Gönder"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:Duraklanıldı"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Client:Bilinmez"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?OS:Unknown?OS:Bilinmez"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Time:Bilinmez"
-
 #~ msgid "Notification"
 #~ msgstr "Bildirim"
 
@@ -10905,9 +11094,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "Choose _Key..."
 #~ msgstr "Bir anahtar dosyası seçin"
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "G_PG acenta kullan"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr "İşaretliyse, Gajim bir GPG acentadan seahorse gibi parolyı alır."
@@ -11031,18 +11217,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgstr "ses girdisi"
 
 #, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Filtre:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "ses girdisi"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Gönder"
-
-#, fuzzy
 #~ msgid "XML Console for %s"
 #~ msgstr "_XML Konsolu Göster"
 
@@ -11297,9 +11471,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>EOturum</b> bilgi)"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "JID veya Kişi adı girdir"
 
diff --git a/po/uk.po b/po/uk.po
index 84d9d55e2..58174b23a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.14.0.1-2fa5ddcd1adf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2013-08-30 12:04+0300\n"
 "Last-Translator: Sergiy Yegorov <prapor@unixzone.org.ua>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
@@ -27,20 +27,20 @@ msgstr "Гу?"
 msgid "Error."
 msgstr "Помилка."
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Справді надіслати файл?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr ""
@@ -97,70 +97,70 @@ msgstr "Час"
 msgid "Progress"
 msgstr "Поступ"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "Назва файла: %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "Розмір: %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "Ви"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "Відправник: %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "Отримувач:"
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "Збережено за адресою: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "Передавання файла завершено"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "В_ідкриту теку, яка містить цей файл"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "Передавання файла скасовано"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "Не вдалося встановити з’єднання з вузлом."
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "Отримувач: %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "Повідомлення про помилку: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "Зупинка передавання файла"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, fuzzy, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -170,126 +170,126 @@ msgstr ""
 "Файл %(file)s було отримано повністю, але схоже що його пошкоджено.\n"
 "Бажаєте перезавантажити його?"
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "Вибрати файл для надсилання..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "_Надіслати"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "Опис: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim не може отримати доступу до цього файла"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не вдалося перезаписати існуючий файл «%s»"
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Файл з такою назвою вже існує, у вас немає дозволів для його перезапису."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "Файл з такою назвою вже існує."
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "Що ви хочете зробити?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Запис до каталогу «%s» неможливий"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "Ваш користувач не має права на створення файлів у цьому каталозі."
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "Зберегти файл як..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s бажає надіслати вам файл:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "Перевірка файлу..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 msgid "File error"
 msgstr "Помилка файлу"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "Некоректний файл"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "Файл: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "Надсилання порожніх файлів не передбачено"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "Назва: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "Відправник:"
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "Призупинити"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "_Продовжити"
 
@@ -452,45 +452,65 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "Потрібен python-gupnp-igd."
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "?features:Доступний"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "Можливість"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "Помилка під час спроби прочитати файл:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "Помилка під час обробки файла:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "Додаток не підтримується"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Зображення не може бути збережено у форматі %(type)s. Зберегти як "
 "%(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "Зберегти зображення як..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Має "
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "?Клієнт:Невідомий"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "?ОС:Невідома"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "?Час:Невідомий"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "?Роль в груповій балачці:<b>Роль:</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Належність:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -499,7 +519,7 @@ msgstr ""
 "Цей контакт зацікавлений у ваших відомостях щодо присутності, але ви не "
 "цікавитеся відомостями щодо його або її присутності"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -508,14 +528,14 @@ msgstr ""
 "Ви зацікавлені у відомостях щодо присутності контакту, але він або вона не "
 "цікавляться вашими відомостями"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Ви і цей контакт взаємно зацікавлені у відомостях щодо присутності одне "
 "одного"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -524,27 +544,37 @@ msgstr ""
 "Ви і цей контакт взаємно зацікавлені у відомостях щодо присутності одне "
 "одного"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ви очікуєте на відповідь контакту на ваш запит щодо підписки"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "У черзі немає запитів на підписку."
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "Всі файли"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "Прибираю"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "Керування профілями проксі"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -587,13 +617,13 @@ msgid "_New Group Chat"
 msgstr "_Створити групову балачку"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "Немає у реєстрі"
 
@@ -606,7 +636,7 @@ msgstr "Я хочу додати вас до свого реєстру"
 msgid "Send Single _Message…"
 msgstr "Надіслати окреме _повідомлення"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "Надіслати не_типовий стан"
@@ -624,25 +654,25 @@ msgstr "_Керування транспортом"
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "Пере_йменувати"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "_Розблокувати"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "_Заблокувати"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "В_илучити"
@@ -656,203 +686,223 @@ msgstr "_Інформація"
 msgid "Send File..."
 msgstr "Надіслати _файл..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "Запросити _контакти"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "_Додати до реєстру"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "Тест аудіо"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "Тест відео"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "_Інформація"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "_Журнал"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "_Керування кімнатою"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "Змінити _тему..."
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "Налаштувати _кімнату..."
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "_Знищити кімнату"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "Змінити _псевдонім..."
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "Зробити закладку на цій кімнаті"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "_Запит голосу"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "Зразки повідомлень:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "_Мінімізувати після закриття"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "Ви_конати команду"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "_Роз'єднати"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "Приєднатись до групової балачки"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "_Додати контакт..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "файл"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "Ви_явити служби"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "_Надіслати окреме повідомлення..."
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "Додатково"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "Редагувати параметри _архівації"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "Синхронізувати"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "Сервер"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "_Адміністратор"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "_Надіслати серверне повідомлення..."
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "Встановити «Повідомлення дня»..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "Оновити «Повідомлення дня»..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "Вилучити «Повідомлення дня»"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "Немає жодного облікового запису"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "Облікові записи"
+
+#: gajim/history_manager.py:56
 msgid "Usage:"
 msgstr "Використання:"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 msgid "Options:"
 msgstr "Опції:"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr "Показати цю довідку та вийти"
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "Не можу знайти базу даних журналу"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "Дата"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "Псевдонім"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Повідомлення"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "Тема"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -860,7 +910,7 @@ msgstr ""
 "Бажаєте спорожнити базу даних? (НАПОЛЕГЛИВО НЕ РЕКОМЕНДУЄМО ЦЬОГО РОБИТИ, "
 "ЯКЩО ЗАПУЩЕНО GAJIM)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -876,97 +926,97 @@ msgstr ""
 "\n"
 "Якщо ви натиснете кнопку «ТАК», вам доведеться зачекати..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr "Очищення бази даних"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "Експорт журналів..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s повідомив: %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "Ви справді бажаєте вилучити журнальні записи %(jid)s?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "Ви справді бажаєте вилучити журнали для обраних контактів?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "Не вдалося знайти службу"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr "Підтвердження видалення"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ви справді бажаєте вилучити виділене повідомлення?"
 msgstr[1] "Ви справді бажаєте вилучити виділені повідомлення?"
 msgstr[2] "Ви справді бажаєте вилучити виділені повідомлення?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "Наслідки цієї дії є незворотними."
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "Отримання профілю..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "Невірний формат дати"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "Формат має бути РРРР-ММ-ДД"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "Отримано відомості"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 msgid "Without a connection, you can not publish your contact information."
 msgstr ""
 "Для того, щоб оприлюднити відомості щодо контакту з вами, вам слід "
 "встановити з’єднання."
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "Надсилання профілю..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "Відомості НЕ оприлюднено"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "Спроба оприлюднення vCard зазнала невдачі"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -983,10 +1033,10 @@ msgstr "Назва контакту: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "Загальне"
@@ -1075,36 +1125,36 @@ msgstr ""
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Будь ласка, вкажіть дані контакту, який ви бажаєте додати"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "Некоректний ідентифікатор користувача"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "У ідентифікаторі користувача не повинно міститися назви ресурсу."
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "Ви не можете додавати себе ж до реєстру."
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "Цей контакт вже є у реєстрі"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "Цей контакт уже є у вашому реєстрі."
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "Ідентифікатор:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "Помилка під час додавання служби. %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1112,61 +1162,61 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "Jabber/XMPP клієнт, що базується на GTK+"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "Версія GTK+:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "Версія PyGTK:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "Поточні розробники:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "Колишні розробники:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 "Нарешті, але ані трохи не менше, ми вдячні всім супровідникам пакунків з "
 "програмою."
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Сергій Єгоров <prapor@unixzone.org.ua> Юрій Чорноіван (0.12)"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "Словники для мови %s не доступні"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1179,12 +1229,12 @@ msgstr ""
 "\n"
 "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "Небезпечне з’єднання"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1197,281 +1247,305 @@ msgstr ""
 "незашифрованим. Цей тип з’єднання справді ненадійний. Ви справді бажаєте це "
 "зробити?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "Так, я справді бажаю знехтувати безпекою"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr "Gajim НЕ буде з’єднуватись доки ви не відмітите цю опцію"
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "Більше _не питати мене"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "_Продовжити"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "За_мінити"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "Некоректний псевдонім"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 msgid "The nickname contains invalid characters."
 msgstr "У псевдонімі є недозволені символи."
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "Запит на підписку"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запит на підписку до облікового запису %(account)s від %(jid)s"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запит на підписку від %s"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "Приєднатись до групової балачки"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "Некоректна кімната"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "Некоректний псевдонім"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "Будь ласка, спершу створіть нову порожню тему з бажаною назвою."
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "Некоректний JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 msgid "Wrong server"
 msgstr "Неправильний сервер"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, python-format
 msgid "%s is not a groupchat server"
 msgstr "%s не є сервером групових балачок"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 "Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
 "запису з сервером."
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Назва"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "Сервер"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "Цей обліковий запис не з’єднано з сервером"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Можливістю синхронізації можна скористатися, лише якщо обліковий запис "
 "з’єднано з сервером."
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "Спілкування з продовженням"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "Створити групову балачку"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "Додати новий контакт"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "До встановлення з’єднання ви не зможете змінити ваш пароль."
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "Некоректний пароль"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "Вам слід ввести пароль."
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "Нове повідомлення"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "Створити окреме повідомлення"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "Нове повідомлення електронної пошти"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "Завершення передавання файла"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "Запрошення до групової балачки"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Окреме повідомлення з використанням облікового запису %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Окреме повідомлення для облікового запису %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "Окреме повідомлення"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "Надіслати %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "Отримано %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "Форма %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Неможливо надіслати повідомлення до %s, вказаний JID не є коректним."
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "Відповідь: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "Прибираю"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "Фільтр:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>Ввід XML</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "_Надіслати"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "додати"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "змінити"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "вилучити"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -1479,28 +1553,28 @@ msgid ""
 msgstr ""
 "<b>%(jid)s</b> бажає <b>%(action)s</b> кілька контактів у вашому реєстрі."
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "Додати"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "Змінити"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "Вилучити"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "Групи"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s підказав мені додати вас до мого реєстру."
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
@@ -1508,7 +1582,7 @@ msgstr[0] "Додано %1 контакт"
 msgstr[1] "Додано %d контакти"
 msgstr[2] "Додано %d контактів"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
@@ -1516,166 +1590,166 @@ msgstr[0] "Вилучено %d контакт"
 msgstr[1] "Вилучено %d контакти"
 msgstr[2] "Вилучено %d контактів"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "Архівація налаштувань для %s"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "Архівація налаштувань для %s"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "Це помилка"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "Помилка."
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID:"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Списки конфіденційності <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Списки приватності для %s"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "Список конфіденційності"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Порядок: %(order)s, дія: %(action)s, тип: %(type)s, значення: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Порядок: %(order)s, дія: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редагувати правило</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додати правило</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки приватності для %s"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "Некоректна назва списку"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "Вас запрошено до групової балачки"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запросив вас до участі у обговоренні"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запросив вас до групової балачки %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "Чи бажаєте ви прийняти це запрошення?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr "Причина (якщо ви відхиляєте):"
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "Оберіть клієнтський сертифікат PCKS#12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "Файли PKCS12"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "Обрати звук"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Звуки wav"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "Вибрати зображення"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Зображення"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "Вибрати архів"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "Файли ZIP"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "Якщо %s стане рівним:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавання особливого сповіщення для %s"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "аудіо та відео"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "аудіо"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "відео"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -1684,12 +1758,12 @@ msgstr ""
 "%(contact)s бажають розпочати %(type)s розмову з вами. Ви бажаєте відповісти "
 "на запит?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr "Сертифікат до облікового запису %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, fuzzy, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1730,70 +1804,98 @@ msgstr ""
 "<b>Відбито:</b>\n"
 "SHA1 Відбиток: %(sha1)s"
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "Перевірка сертифіката SSL для %s"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 #, fuzzy
 msgid "View cert…"
 msgstr "Перегляд сертифікату..."
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "Перенесення файлів"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "Шифрування E2E вимкнено"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s тепер стає %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s тепер %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "Спроба надсилання конфіденційного повідомлення зазнала невдачі"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Ви полишили групову балачку «%(room)s» або це зробив (зробила) «%(nick)s»."
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "Збереження метаконтактів не підтримується вашим сервером"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "Зміна теми"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "Будь ласка, вкажіть нову тему:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "Зміна псевдоніма"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "Некоректний ідентифікатор Jabber групової балачки"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr ""
 "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "Знищення %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1802,248 +1904,258 @@ msgstr ""
 "Ви маєте намір знищити цю кімнату.\n"
 "Нижче ви можете вказати причину цього рішення:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "Вставити псевдонім"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "і НЕ уповноваженим"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "Шифрування %(type)s %(status)s активним %(authenticated)s.\n"
 "Ваш сеанс балачки %(logged)s записано до журналу."
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "Спілкування з"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "Спілкування з продовженням"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s встановив тему %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Всі учасники можуть бачити ваш JID повністю"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 msgid "Room now shows unavailable members"
 msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 msgid "Room now does not show unavailable members"
 msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "Тепер увімкнено запис повідомлень кімнати"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "Тепер запис кімнати вимкнено"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "Тепер у кімнаті вимкнено анонімність"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "Тепер у кімнаті увімкнено напіванонімність"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "Тепер у кімнаті увімкнено анонімність"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Га! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(jid)s було запрошено до цієї кімнати"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "Увімкнено запис кімнати"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "Було створено нову кімнату"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер призначив вам псевдонім у кімнаті або змінив цей псевдонім"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s було викинуто: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s було викинуто %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s було заблоковано: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s було заблоковано %(who)s: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "змінено місце роботи"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "налаштування кімнати змінено на «лише для постійних учасників»"
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "вимкнення системи"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Належність %(nick)s було встановлено у значення %(affiliation)s %(actor)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Належність of %(nick)s було встановлено у значення %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s %(actor)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s вийшов"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки."
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "Викидання %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "Нижче ви можете зазначити причину:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "Блокування %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "Перенесення файлів"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "Перенесення файлу не вдалося"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "Показати список інструментів форматування"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 #, fuzzy
 msgid "Formatting is not available so long as GPG is active"
 msgstr "Форматування не доступне коли активовано GPG"
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 msgid "This contact does not support HTML"
 msgstr "Цей контакт не підтримує HTML"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s стан : %(state)s, причина: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групової балачки %(room_name)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "Встановлення сеансу було скасовано"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "Цей сеанс БУДЕ збережена на сервері"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "Цей сеанс НЕ БУДЕ збережено на сервері"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "Цей сеанс зашифровано"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr " і БУДЕ записано до журналу"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr " і НЕ БУДЕ записано до журналу"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -2051,16 +2163,16 @@ msgstr ""
 "Особу віддаленого контакту не було перевірено. Натисніть кнопку з щитом, щоб "
 "ознайомитися з подробицями."
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "Шифрування E2E вимкнено"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2068,7 +2180,7 @@ msgstr ""
 "Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
 "втрачено."
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2077,7 +2189,7 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2086,92 +2198,92 @@ msgstr ""
 "Не вдалося розшифрувати повідомлення від %s\n"
 "Можливо, хтось втрутився у ваше з’єднання."
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s тепер %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 msgid "File transfer"
 msgstr "Перенесення файлів"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 msgid "Size"
 msgstr "Розмір"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 msgid "_Accept"
 msgstr "_Прийняти"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "При_єднатися"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "Віддалений контакт зупинив передавання файлу"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "Помилка під час спроби прочитати файл"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "Групові балачки"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "Транспорти"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "Було надіслано уповноваження"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "Уповноваження було вилучено"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 msgid "OpenPGP is not usable"
 msgstr "GPG непридатне для використання"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2179,11 +2291,11 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "Ви берете участь у одній або декількох групових балачках"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -2191,27 +2303,27 @@ msgstr ""
 "Зміна стану на «невидимий» призведе до вашого виходу з наведених групових "
 "балачок. Ви справді бажаєте змінити стан на «невидимий»?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "розсинхронізація"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "Справді вийти з Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ви справді бажаєте вийти з Gajim?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Завжди закривати Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "Ви маєте активні перенесення файлів"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
@@ -2219,11 +2331,11 @@ msgstr ""
 "Якщо ви вийдете зараз, усі передачі файлів буде зупинено. Ви все ще бажаєте "
 "вийти?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2231,16 +2343,16 @@ msgstr ""
 "Доступ для читання повідомлень буде можливим, лише якщо ви увімкнули журнал, "
 "а контакт наявний у вашому реєстрі."
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "Вам слід прочитати їх, перш ніж вилучати цей транспорт."
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" буде вилучено"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -2248,11 +2360,11 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цього транспорту."
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "Транспорти буде вилучено"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -2261,11 +2373,11 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цих транспортів: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
@@ -2274,56 +2386,56 @@ msgstr ""
 "Цей контакт буде бачити вас як \"поза мережею\" та ви не будете отримувати "
 "від нього повідомлень."
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "Перейменувати контакт"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введіть новий псевдонім для контакту %s"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "Перейменувати групу"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введіть нову назву для групи %s"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "Вилучити групу"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Бажаєте вилучити групу %s з реєстру?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "Призначити ключ OpenPGP"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "Оберіть ключ для використання з цим контактом"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» буде вилучено з вашого реєстру"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Ви збираєтесь вилучити \"%(name)s\" (%(jid)s) з вашого реєстру.\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2333,11 +2445,11 @@ msgstr ""
 "призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся "
 "поза мережею."
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -2346,15 +2458,15 @@ msgstr ""
 "Вилучення цього контакту призведе до вилучення уповноваження, отже він або "
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти буде вилучено з вашого реєстру"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2364,12 +2476,12 @@ msgstr ""
 "призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся "
 "поза мережею."
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "Ви маєте намір надіслати особливий статус. Ви справді цього бажаєте?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2378,26 +2490,26 @@ msgstr ""
 "Цей контакт тимчасово бачитиме вас як %(status)s, но лише до зміни вашого "
 "статусу. Потім він бачитиме ваш глобальний статус."
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
 "обліковий запис."
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Ви не можете приєднуватися до групової балачки зі станом «невидимий»"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
@@ -2405,12 +2517,12 @@ msgstr ""
 "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
 "відомості не буде збережено до наступного з’єднання."
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2420,11 +2532,11 @@ msgstr ""
 "списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
 "є особа з декількома обліковими записами або транспортами Jabber."
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -2432,180 +2544,180 @@ msgstr[0] "Ви справді бажаєте надіслати цей файл
 msgstr[1] "Ви справді бажаєте надіслати ці файли до %s:"
 msgstr[2] "Ви справді бажаєте надіслати ці файли до %s:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "Надіслати %s до %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "Зробити %s першим контактом."
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "Робить %s та %s метаконтактом."
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "Оприлюднити положення"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "Налаштувати служби..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "За_просити до"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "Редагувати _групи"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "В_илучити"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "_Перез’єднати"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "_Роз'єднати"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "_Журнал"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "_Приєднатись до нової групової балачки"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "_Змінити повідомлення про стан"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Показувати піктограму зони сповіщень"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 msgid "Show only critical errors"
 msgstr "_Показати лише критичні помилки"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Показувати повідомлення xml та іншу відлагоджувальну інформацію"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 msgid "Use defined profile in configuration directory"
 msgstr "Використовувати призначений профіль у каталозі налаштувань"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 msgid "Set configuration directory"
 msgstr "Призначити конфігураційний каталог"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr "Налаштувати ведення журналів"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показати усі _події з черги"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "Що ви хочете зробити?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "Виконується з'єднання"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "Передавання файлу·%(filename)s·від·%(name)s невдале"
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "Переспрямувати непрочитані повідомлення"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2614,7 +2726,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2622,7 +2734,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2767,16 +2879,16 @@ msgstr "Обліковий запис вимкнено"
 msgid "To unregister from a server, account must be enabled."
 msgstr "Щоб зняти реєстрацію з серверу, обліковий запис має бути активним."
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "Слід ввести пароль"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "Зберегти пароль"
 
@@ -2806,10 +2918,18 @@ msgstr "Вилучити _лише з Gajim"
 msgid "Don't remove anything. I'll try again later"
 msgstr "Не видаляти нічого. Я спробую пізніше ще раз."
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "Всі"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "Лише вхід і вихід"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "Жодного"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "Створити групову балачку"
@@ -2876,11 +2996,11 @@ msgstr "Некоректний запис"
 msgid "Custom port must be a port number."
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "Сертифікат вже наявний у файлі"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
@@ -2984,90 +3104,112 @@ msgstr "Виділення повідомлення групової балач�
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s цієї групової балачки"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Членство контакту у груповій балачці:Жодного"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "Учасник"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "Адміністратор"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "Власник"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr " [заблоковано]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr " [мінімізовано]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "З'єднано"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "Роз'єднано"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "Звантажити"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "Вивантажити"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "Тип: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "Передано:"
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "Не розпочато"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "Зупинено"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "Завершено"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "Призупинено"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "Заблоковано"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "Перенесення"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "Стан: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "?стан користувача:Доступний"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "Вільний для балачки"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "Далеко"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "Дуже далеко"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "Поза мережею"
 
@@ -3116,122 +3258,126 @@ msgstr "(Немає)"
 msgid "Hidden"
 msgstr "Сховано"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr "Комп’ютер присипляється"
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал спілкування з %s"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Журнал спілкування"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "Помилка роботи з диском"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s тепер %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "Помилка: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "Помилка."
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Поточний стан: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Поточний стан: %(status)s"
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "_Змінити повідомлення про стан"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "з облікового запису %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Керування закладками"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "Сховати реєстр"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "Показати _реєстр"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "Сховати це меню"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "Не вдалося завантажити зображення"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "Тим медіа не підтримується: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "Це обов’язкове поле"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "Назва _вузла:"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "Збережено за адресою: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3391,7 +3537,7 @@ msgstr "_Підписатися"
 msgid "_Unsubscribe"
 msgstr "_Скасувати підписку"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -3399,51 +3545,60 @@ msgstr ""
 "Текст під цим рядком відповідає повідомленням, які було\n"
 "надіслано з часу, коли ви востаннє зазирали до цього вікна групової балачки"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "_Цитата"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дії для «%s»"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "Прочитати статтю у В_ікіпедії"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "Пошукати це у _словнику"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "У адресі URL словника не вказано «%s», або ключового слова WIKTIONARY"
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адресі URL для пошуку у Тенетах не вказано «%s»"
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "Пошук у _Тенетах"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "Відкрити як _посилання"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr "URL:"
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "Некоректний JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+#, fuzzy
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+"<b>Повідомлення було відредаговане. Останнє повідомлення було:</b>\n"
+"   %s"
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3456,30 +3611,35 @@ msgstr[2] "%(nb_days)i днiв тому"
 msgid "Write a message.."
 msgstr "Отримано повідомлення"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "Ви збираєтесь закрити кілька вкладок"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "Ви справді бажаєте закритити їх усі?"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "Групові балачки"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "Конфіденційні балачки"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3491,111 +3651,111 @@ msgstr ""
 "використовує інший учасник.\n"
 "Будь ласка, вкажіть нижче інший псевдонім:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "Завжди використовувати цей псевдонім при виникненні конфліктів."
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "Чи приймаєте ви цей запит?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>Шрифт</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "Вас заблокували у груповій балачці <b>%s</b>."
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "Групової балачки <b>%s</b> не існує."
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "Групової балачки <b>%s</b> не існує."
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "Можливість створення групових балачок обмежено."
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr ""
 "Для групової балачки <b>%s</b> слід використовувати псевдонім, під яким ви "
 "зареєструвалися."
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас немає у списку постійних учасників групової балачки %s."
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Помилка %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "Спостерігачі"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "Уповноваження прийнято"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» вилучив вашу підписку"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3604,31 +3764,31 @@ msgstr ""
 "Цей контакт завжди буде показано зі станом «поза мережею».\n"
 "Бажаєте вилучити контакт з вашого списку контактів?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "_Непідписаний"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Зв’язок з «%s» встановити не вдалося"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "Перевірте ваше з’єднання, а потім повторіть спробу."
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr "%(jid)s відхилив запрошення: %(reason)s"
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr "%(jid)s відхилив запрошення"
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
@@ -3636,35 +3796,35 @@ msgstr ""
 "Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
 "або цей агент повернув помилковий пароль.\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 msgid "Certificate Passphrase Required"
 msgstr "Потрібна кодова фраза для сертифікату"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "Введіть пароль ключа GPG для сертифікату від облікового запису %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "Оберіть свій ключ OpenPGP"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
@@ -3672,7 +3832,7 @@ msgstr ""
 "GPG ключ призначений для цієї балачки не довірений. Ви справді бажаєте "
 "зашифрувати це повідомлення?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
@@ -3680,72 +3840,77 @@ msgstr ""
 "Будь ласка, скопіюйте/вставте оновлений запис з веб-сторінки яка щойно "
 "відкрилася."
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr "Облікові дані Oauth2"
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s бажає надіслати вам файл."
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "Помилка сертифіката SSL"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 msgid "File Transfer Failed"
 msgstr "Перенесення файлу не вдалося"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s невдале"
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s невдале"
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Ви успішно надіслали %(filename)s до %(name)s."
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Надсилання файлу %(filename)s до %(name)s невдале."
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "Вибрати файл для надсилання..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "Не вдалося розшифрувати повідомлення"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "Конфлікт імен користувачів"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr ""
 "Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
 "запису"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "Конфлікт ресурсів"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -3753,20 +3918,20 @@ msgstr ""
 "Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
 "ласка, вкажіть інший ресурс"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s бажає розпочати голосову розмову."
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "Запит на голосову розмову"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "Помилка під час перевірки сертифіката SSL"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3777,7 +3942,7 @@ msgstr ""
 "помилка: %(error)s\n"
 "Ви все ще маєте намір з’єднатися з сервером?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3790,15 +3955,15 @@ msgstr ""
 "Відбиток SHA1 сертифіката:\n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3819,7 +3984,7 @@ msgstr ""
 "\n"
 "Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3828,7 +3993,7 @@ msgstr ""
 "безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
 "зараз?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -3836,33 +4001,33 @@ msgstr ""
 "Ви маєте намір надіслати ваш пароль незашифрованим з’єднанням у відкритому "
 "вигляді. Виконати надсилання пароля?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "Це не групова балачка"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "Емоційки вимкнено"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "Це не групова балачка"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3870,40 +4035,40 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "типовий"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "Слід вказати пароль"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 msgid "OpenPGP key expired"
 msgstr "GPG ключ застарів"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ваш ключ GPG застарів. З’єднання з %s буде встановлено без OpenPGP."
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
@@ -3974,6 +4139,11 @@ msgstr "- вестиметься запис повідомлень"
 msgid "- messages will not be logged"
 msgstr "- не вестиметься запис повідомлень"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -4007,7 +4177,7 @@ msgstr "Некоректна форма"
 msgid "The form is not filled correctly."
 msgstr "Форму заповнено некоректно"
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "Невидимка"
 
@@ -4144,6 +4314,56 @@ msgstr ""
 "%s\n"
 "Обмін локальними повідомленнями може працювати з помилками."
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "Не вдалося запустити локальну службу"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "Не вдалося завантажити зображення"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "Служба повернула повідомлення про помилку."
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "Не вдалося завантажити зображення"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "З'єднання недоступне"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Тема"
@@ -4169,7 +4389,17 @@ msgstr "Ви не можете вилучати вашої поточної те
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "Об’єднані облікові записи"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "Використовувати _агент GnuPG"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
@@ -4194,6 +4424,11 @@ msgstr ""
 "Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
 "процедуру виходу?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "В_илучити"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4389,52 +4624,64 @@ msgstr "Змінити пароль"
 msgid "Login Options"
 msgstr "Опції:"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "У цій системі немає D-Bus або відсутній потрібний модуль python"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "Показує довідку щодо вказаної команди"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "команда"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "показати довідку щодо команди"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "Вмикає або вимикає показ вікна реєстру"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr ""
 "Відкриває контекстне вікно з повідомленням про наступну заплановану подію"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Показує список всіх контактів з реєстру. Кожен з записів контактів буде "
 "показано у окремому рядку"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+msgid "?CLI:account"
+msgstr "?CLI:обліковий запис"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "показати лише контакти вказаного облікового запису"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "Показує список зареєстрованих облікових записів"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Змінює стан облікового запису або обліковий запис"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+msgid "?CLI:status"
+msgstr "?CLI:стан"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4443,11 +4690,16 @@ msgstr ""
 "турбувати, невидимий. Якщо не вказано, буде використано попередній стан "
 "облікового запису."
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+msgid "?CLI:message"
+msgstr "?CLI:повідомлення"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "повідомлення про стан"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4456,16 +4708,20 @@ msgstr ""
 "вказано, спробувати змінити стан всіх облікових записів, для яких було "
 "позначено пункт «синхронізувати з загальним станом»"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Змінює пріоритет одного або кількох облікових записів"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+msgid "?CLI:priority"
+msgstr "?CLI:пріоритет"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "пріоритет який ви бажаєте надати обліковому запису"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4474,7 +4730,7 @@ msgstr ""
 "не вказано, спробувати змінити стан всіх облікових записів, для яких було "
 "позначено пункт «синхронізувати з загальним станом»"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4485,29 +4741,29 @@ msgstr ""
 "встановити лише 'account', без 'OpenPGP key', просто встановіть значення "
 "'OpenPGP key' рівним ''."
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакту, який отримає це повідомлення"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "вміст повідомлення"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "якщо вказано, повідомлення буде зашифровано відкритим ключем"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "якщо вказано, повідомлення буде надіслано з цього облікового запису"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4518,124 +4774,124 @@ msgstr ""
 "встановити лише 'account', без 'OpenPGP key', просто встановіть значення "
 "'OpenPGP key' рівним ''."
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "тема"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "тема повідомлення"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Надсилає нове повідомлення до групової балачки, до якої ви приєдналися."
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID кімнати, де буде отримано це повідомлення"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "JID контакту"
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "Назва облікового запису"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "Надсилає контакту файл"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "Шлях до файла"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "якщо вказано, файл буде надіслано з цього облікового запису"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Показує список всі параметрів та значення цих параметрів"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Встановлює значення «ключ» у «значення»"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "ключ=значення"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "«ключ» — це назва параметра, «значення» — значення параметра"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "Вилучає запис параметра"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "ключ"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "назва параметра, який буде вилучено"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записує поточні значення параметрів Gajim до файла .config"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "Вилучає контакт з реєстру"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "якщо вказано, контакт буде взято зі списку контактів цього облікового запису"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Повертає поточний стан (загальний стан, якщо не було вказано облікового "
 "запису)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Повертає поточне повідомлення стану (загальне повідомлення, якщо не було "
 "вказано облікового запису)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "Повертає кількість непрочитаних повідомлень"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "Надсилає нетиповий XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "XML для надсилання"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4644,15 +4900,15 @@ msgstr ""
 "Обліковий запис, на який буде надіслано xml; якщо не вказано, xml буде "
 "надіслано до всіх облікових записів"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "Змінити аватар"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "Картинка, яку слід використовувати"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4660,19 +4916,19 @@ msgstr ""
 "Обліковий запис, на для якого буде встановлено аватар; якщо не вказано, "
 "аватар буде встановлено до всіх облікових записів"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "Перевірити, чи запущено Gajim"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "Показує або ховає вікно ipython"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущено аргумент «contact_jid»"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4681,16 +4937,16 @@ msgstr ""
 "«%s» немає у реєстрі.\n"
 "Будь ласка, вкажіть обліковий запис для надсилання цього повідомлення."
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "У вас немає жодного задіяного облікового запису"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Здається, Gajim не запущено. Отже ви не зможете скористатися gajim-remote."
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4699,16 +4955,16 @@ msgstr ""
 "Використання: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr "%s не знайдено"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4719,7 +4975,7 @@ msgstr ""
 "Використання: %s команда [аргументи]\n"
 "Можливі команди:\n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4728,7 +4984,7 @@ msgstr ""
 "Забагато аргументів. \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4902,11 +5158,6 @@ msgstr "Кінець тижня"
 msgid "Weekend!"
 msgstr "Вихідні!"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "облікового запису %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4931,52 +5182,52 @@ msgstr "Кімнату було знищено"
 msgid "You can join this room instead: %s"
 msgstr "Ви можете приєднатися замість цієї кімнати до %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Невідома помилка SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нове окреме повідомлення від %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нове конфіденційне повідомлення з групової балачки %s"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Повідомлення надіслано від імені %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нове повідомлення від %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змінив стан"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s в мережі"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s вийшов з мережі"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "Немає у реєстрі"
 
@@ -5847,22 +6098,18 @@ msgstr "Увімкнути шифрування ESession для цього об�
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Чи має Gajim автоматично починати сеанс з шифруванням за можливості?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
 msgstr ""
-"Впорядкований список відокремлених комами типів з’єднання, які має "
-"спробувати програма. Можливі значення: tls, ssl і plain"
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
@@ -5870,24 +6117,24 @@ msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати пароль звичайним "
 "текстом. Може бути 'поперджати', 'з’єднувати', 'відключати'"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж користуватися стандартною "
 "бібліотекою SSL."
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати відкритий пароль "
 "незашифрованим з'єднанням."
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Відокремлений пробілами список помилок ssl, які слід ігнорувати."
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
@@ -5896,13 +6143,13 @@ msgstr ""
 "журнали. Ви можете також додати назву облікового запису для якого не буде "
 "вестись журналювання."
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
@@ -5910,15 +6157,15 @@ msgstr ""
 "Розділений пробілами перелік ідентифікаторів JID для яких ви згодні не "
 "зберігати записи якщо вони цього не хочуть."
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "Надсилання порожнього повідомлення після неактивності."
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "Надсилання XMPP ехо після неактивності."
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
@@ -5927,11 +6174,11 @@ msgstr ""
 "пакет підтримування зв’язку, перш ніж розпочати процедуру повторного "
 "з’єднання."
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "Обхідний прийом для Jabberd2"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5940,7 +6187,7 @@ msgstr ""
 "проксі сервери, визначення параметром file_transfer_proxies, для передавання "
 "файлів."
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
@@ -5949,26 +6196,26 @@ msgstr ""
 "старті, щоб переконатись у їх працездатності. Openfire не проходить цей тест "
 "навіть якщо працездатний."
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "Відповідати на запити щодо підтвердження отримання"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "Надіслані запити на підтвердження отримання"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr ""
 "Дозволити Gajim надсилати інформацію, яку операційну систему ви "
 "використовуєте"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "Дозволятии Gajim надсилати ваш локальний часд"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -5976,11 +6223,11 @@ msgstr ""
 "Під час налаштування сеансу з шифруванням, чи слід Gajim припускати, що ви "
 "бажаєте вести запис повідомлень?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "Повідомлення що буде надіслано контакту який ви бажаєте додати"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
@@ -5988,7 +6235,7 @@ msgstr ""
 "Якщо увімкнено та сервер підтримує цю можливість, Gajim буде отримувати "
 "повідомлення надіслані та отримані іншими ресурсами."
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
@@ -5996,22 +6243,22 @@ msgstr ""
 "Якщо увімкнено, Gajim надішле ваш локальний IP щоб контакт міг з’єднатись та "
 "надіслати вам файли."
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "Останній запис аутентифікації Oauth2"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "client_id для аутентифікації Oauth2"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "redirect_url для аутентифікації Oauth2."
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
@@ -6019,15 +6266,25 @@ msgstr ""
 "Розділений пробілами перелік ідентифікаторів JID для яких ви хочете "
 "відкривати вікно балачки при наступному запуску."
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
@@ -6035,7 +6292,7 @@ msgstr ""
 "Як багато робити запитів до сервера при під’єднанні до групової балачки. -1 "
 "означає без обмежень, -2 означає глобальні налаштування"
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
@@ -6044,11 +6301,11 @@ msgstr ""
 "За скільки хвилин запитувати журнал, при вході у групову балачку. -1 означає "
 "без обмеження, -2 означає глобальні налаштування."
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
@@ -6058,79 +6315,79 @@ msgstr ""
 "виході з Gajim). Ця опція НЕ ПОВИННА бути використана для (де)активації "
 "додатків. Використовуйте для цього графічний інтерфейс користувача."
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "Їм"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "Відео"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "Працюю"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "Телефон"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "Пока!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6139,27 +6396,27 @@ msgstr ""
 "зі слів, вказаних за допомогою параметра muc_highlight_words, або якщо "
 "повідомлення групової балачки містить ваш псевдонім."
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "зелений"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "овочевий"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "тілесний"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "морський"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 msgid "Tor"
 msgstr "Tor"
 
@@ -6236,36 +6493,49 @@ msgstr "Всі непрочитані повідомлення було пере
 msgid "Forward unread message then disconnect"
 msgstr "Переспрямувати непрочитані повідомлення на від’єднатись"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "Файл порожній"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "Файла не існує"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "створення бази даних журналів"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "створення бази даних кешу"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "Надіслати %s до %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s є файлом, а має бути каталогом"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Зараз Gajim завершить роботу"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s є каталогом, а має бути файлом"
@@ -6275,11 +6545,11 @@ msgstr "%s є каталогом, а має бути файлом"
 msgid "Error: cannot open %s for reading"
 msgstr "Помилка: не вдалося відкрити %s для читання"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "блакитний"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "перехід від бази даних журналів до покажчика"
 
@@ -6288,191 +6558,191 @@ msgstr "перехід від бази даних журналів до пока
 msgid "%s is not a valid loglevel"
 msgstr "%s не є коректним рівнем журналювання"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "Не вдається отримати сертифікат видавця"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "Не вдалося отримати список відкликаних сертифікатів"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "Не вдалося розшифрувати підпис сертифікату"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "Не вдалося розшифрувати підпис списку відкликаних сертифікатів"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "Не вдалося декодувати відкритий ключ видавця"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "Помилка під час підписування сертифіката"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "Помилка під час роботи з підписом списку відкликаних сертифікатів"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "Сертифікат ще не набув чинності"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "Строк дії сертифікату завершився!"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "Строк дії CRL ще не почався"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "Строк дії CRL завершився"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "Помилка форматування у полі сертифіката notBefore"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "Помилка форматування у полі сертифіката notAfter"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Помилка форматування у полі сертифіката lastUpdate"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Помилка форматування у полі сертифіката nextUpdate"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "Не вистачає пам'яті"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "Сертифікат є самопідписаним"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопідписаний сертифікат у ланцюжку сертифікатів"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "Не вдалося отримати сертифікат локального видавця"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "Не вдалося перевірити перший сертифікат"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "Ланцюжок сертифіката занадто великий"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "Сертифікат відкликано"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "Некоректний сертифікат CA"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "Перевищення обмеження на довжину адреси"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "Непідтримуване призначення сертифіката"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "Сертифікат є недостовірним"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "Сертифікат відхилено"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Видано для іншого призначення"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Не збігаються поля видавця та ідентифікатора призначення ключа"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серійні номери служби сертифікації і видавця не збігаються"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "До призначення ключа не належить підписування сертифікатів"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "Помилка під час перевірки програми"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "З’єднання з обліковим записом «%s» було втрачено"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "Виконати повторне з’єднання вручну."
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Від сервера %(name)s було отримано помилкову відповідь на запит щодо "
 "реєстрації: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "На сервері %s передбачено іншу форму реєстрації"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Не вдалося з’єднатися з «%(host)s» через проксі «%(proxy)s»"
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Не вдалося з’єднатися з «%(host)s»"
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "Збережено за адресою: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "Спроба встановити з'єднання з проксі-сервером завершилася невдало"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не вдалося з’єднатися з обліковим записом %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "З’єднання з обліковим записом було втрачено %s. Повторна спроба з’єднання."
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Достовірність сертифіката %s знаходиться під питанням."
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6481,7 +6751,7 @@ msgstr ""
 "\n"
 "Помилка SSL: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6490,7 +6760,7 @@ msgstr ""
 "\n"
 "Невідома помилка SSL: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
@@ -6499,31 +6769,31 @@ msgstr ""
 "Достовірність сертифіката %s знаходиться під питанням. Сертифікат не "
 "відповідає поточному домену."
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не вдалося з’єднатися з «%s»"
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "Будь ласка, перевірте, чи правильно вказано ім’я користувача і пароль."
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "Відправлений контакт:  \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "Надіслати контакти:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "Не отримано через стан невидимості"
 
@@ -7390,162 +7660,186 @@ msgstr "відео вхід"
 msgid "video output"
 msgstr "відео вихід"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "Сервер має бути від 1 до 1023 символів"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "Некоректний символ у назві вузла."
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "Слід вказати адресу сервера."
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "Ім’я користувача повинно бути від 1 до 1023 символів"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "Некоректний символ у імені користувача."
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "Ресурс має бути від 1 до 1023 символів"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "Некоректний символ у назві ресурсу."
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "_Зайнятий"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "_Не доступний"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "_Вільний для балачки"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "?стан користувача:_Доступний"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "Виконується з'єднання"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "В_ідійшов"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "_Поза мережею"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "_Невидимий"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "?стан контакту:Невідомий"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "?стан контакту:З помилками"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "?Підписка яку ми вже маємо:Жодної"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "До"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "Від"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Обидва"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "?Запит (на підписку):Немає"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "Підписатися"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "?Роль у груповій балачці:Немає"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "Модератори"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "Модератор"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "Учасники"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "Учасник"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "Відвідувачі"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "Відвідувач"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "спілкується"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "робить щось інше"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "пише повідомлення..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "призупинив (призупинила) створення повідомлення"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "закрив (закрила) вікно або вкладку балачки"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s кіБ"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -7553,22 +7847,22 @@ msgstr[0] "у черзі %d повідомлення"
 msgstr[1] "у черзі %d повідомлення"
 msgstr[2] "у черзі %d повідомлень"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " з кімнати %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " від користувача %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " від %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -7576,74 +7870,74 @@ msgstr[0] "у черзі %d подія"
 msgstr[1] "у черзі %d події"
 msgstr[2] "у черзі %d подій"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "Я хочу додати вас до мого списку контактів."
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "Привіт, я $name."
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "Перевищення часу очікування під час завантаження зображення"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "Зображення є завеликим"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 msgid "PyCURL is not installed"
 msgstr "PyCURL не встановлено"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 msgid "Error loading image"
 msgstr "Помилка завантаження зображення"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Відомості щодо реєстрації з транспорту %s не надійшли протягом визначеного "
 "проміжку часу"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "повідомлення"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
@@ -7682,44 +7976,44 @@ msgstr ""
 "Шина системи недоступна.\n"
 "Спробуйте ознайомитися з %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Будь ласка, переконайтеся, що встановлено Avahi або Bonjour."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "Не вдалося запустити локальну службу"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не вдалося прив’язатися до порту %d."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "Будь ласка, переконайтеся, що запущено фонову службу avahi."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не вдалося змінити стан облікового запису «%s»"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "Ваше повідомлення неможливо надіслати."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 "Контакт перебуває поза мережею. Ваше повідомлення не може бути надіслано."
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7961,6 +8255,11 @@ msgstr "_Заблокувати"
 msgid "_Add to Roster"
 msgstr "_Додати до реєстру"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "Ви_конати команду"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -8241,11 +8540,11 @@ msgstr "Відомості"
 msgid "Con_tinue"
 msgstr "_Продовжити"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "П_ризупинити"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "_Скасувати"
@@ -8254,31 +8553,31 @@ msgstr "_Скасувати"
 msgid "_Open Containing Folder"
 msgstr "В_ідкриту теку, яка містить цей файл"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "Перенесення файлів"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "перелік передач файлів"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Перелік активних, завершених та зупинених передач файлів"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "Споро_жнити"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Вилучає завершені, скасовані та невдалі передавання файлів зі списку"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "Вилучити передавання файла зі списку."
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8286,31 +8585,36 @@ msgstr ""
 "За допомогою цього пункту можна вилучити окреме передавання файла зі списку. "
 "Якщо це передавання ще триває, його буде зупинено, а потім вже вилучено"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "Скасовує обране передавання файлу і вилучає незавершені файли"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "Скасувати передавання файла"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "Скасовує обране передавання файла"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "_Надіслати і закрити"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "Сховати вікно"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "П_овідомити мене про завершення передавання файлу"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показувати контекстне сповіщення про завершення передавання файла"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "Показує список передавань файлів"
 
@@ -8319,7 +8623,7 @@ msgid "Register to"
 msgstr "Зареєструватись на"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "_Гаразд"
 
@@ -8350,20 +8654,20 @@ msgstr "Шрифт"
 msgid "Clear formatting"
 msgstr "Зняти форматування"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Показати список емоційок (Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "Оберіть клієнтський сертифікат"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "Показати список емоційок (Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "Тип події"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "Опис події"
 
@@ -8425,7 +8729,7 @@ msgstr "<b>Шрифт</b>"
 msgid "<b>#</b>"
 msgstr "<b>Шрифт</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "№"
 
@@ -9163,10 +9467,6 @@ msgstr "_Відкрити..."
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Редактор додаткових налаштувань</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "Додатково"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "Почати _балачку"
@@ -9406,7 +9706,7 @@ msgid "_Open Email Composer"
 msgstr "_Відкрити редактор поштових повідомлень"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "_Почати балачку"
 
@@ -9451,6 +9751,10 @@ msgstr "Параметри"
 msgid "Default:"
 msgstr "Типовий"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "Додати новий контакт"
@@ -9476,6 +9780,16 @@ msgstr "_Прізвисько:"
 msgid "_Group:"
 msgstr "_Група:"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "Ідентифікатор:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "Псевдонім"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9513,6 +9827,11 @@ msgstr ""
 "Ви маєте з’єднатися з транспортом, щоб мати змогу\n"
 "додавати контакти з цього протоколу."
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "_Змінити повідомлення про стан"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>Настрій:</b>"
@@ -9727,10 +10046,9 @@ msgstr "_Виконати команду..."
 msgid "_Verify"
 msgstr "Пере_вірити"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "Облікові записи"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "(Відомості <b>ESession</b>)"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9757,11 +10075,6 @@ msgstr "Показувати лише _активні контакти"
 msgid "Show Transports"
 msgstr "Показувати транс_порти"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "Перенесення файлів"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9832,34 +10145,24 @@ msgstr "Мінімізувати після автоматичного приє�
 msgid "Pr_int status:"
 msgstr "Друкувати стан:"
 
-#: gajim/data/gui/exception_dialog.ui:7
-#, fuzzy
-msgid "Exception"
-msgstr "опис"
-
-#: gajim/data/gui/exception_dialog.ui:44
-#, fuzzy
-msgid "Report Bug"
-msgstr "_Повідомити про помилку"
-
-#: gajim/data/gui/exception_dialog.ui:89
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
 msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
 msgstr ""
 "Ця помилка не є критичною, але все ж варто повідомити про неї розробникам."
 
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "Запит на підписку"
+#: gajim/data/gui/exception_dialog.ui:115
+#, fuzzy
+msgid "Report Bug"
+msgstr "_Повідомити про помилку"
 
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "_Заборонити"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -9867,16 +10170,11 @@ msgstr ""
 "Заборонити уповноваження контакту, щоб він або вона не могли бачити, коли ви "
 "виходите на зв'язок."
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "_Дії"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "_Уповноважити"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
 "Уповноважити контакт, щоб він або вона могли бачити, коли ви виходите на "
@@ -9896,11 +10194,11 @@ msgstr ""
 msgid "Presets"
 msgstr "П_рисутність"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "Запросіть друзів!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9909,15 +10207,20 @@ msgstr ""
 "Ви маєте намір почати групову балачку.\n"
 "Оберіть контакти, які ви бажаєте запросити"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "Будь ласка, оберіть сервер групової балачки."
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "Сервер групової балачки"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "_Запросити"
 
@@ -10040,11 +10343,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "Прибираю"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -10207,6 +10505,15 @@ msgstr "Показати усі _події з черги"
 msgid "Mute Sounds"
 msgstr "Вимкнути звук"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "Параметри"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr ""
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "Кому:"
@@ -10611,15 +10918,6 @@ msgstr "Перезаписати?"
 msgid "Configuration"
 msgstr "Налаштування"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-#, fuzzy
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip"
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Клієнт служби миттєвих повідомлень Jabber"
@@ -10745,6 +11043,35 @@ msgstr "Нещодавно:"
 msgid "Plugin manager"
 msgstr "Активація додатка невдалаДодаток"
 
+#, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "облікового запису %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "опис"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>someone@somewhere.com</b> бажає <b>додати</b> до вашого реєстру де-які "
+#~ "контакти."
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr ""
+#~ "Впорядкований список відокремлених комами типів з’єднання, які має "
+#~ "спробувати програма. Можливі значення: tls, ssl і plain"
+
+#~ msgid "_Actions"
+#~ msgstr "_Дії"
+
+#, fuzzy
+#~ msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+#~ msgstr "chat;messaging;im;jabber;xmpp;bonjour;voip"
+
 #~ msgid "UPower"
 #~ msgstr "UPower"
 
@@ -10963,12 +11290,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Hide the chat buttons"
 #~ msgstr "Сховати кнопки балачки"
 
-#~ msgid "File is empty"
-#~ msgstr "Файл порожній"
-
-#~ msgid "File does not exist"
-#~ msgstr "Файла не існує"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10996,51 +11317,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "Потрібен python-pyopenssl > 0.12 та pyasn1."
 
-#~ msgid "?user status:_Available"
-#~ msgstr "?стан користувача:_Доступний"
-
-#~ msgid "?user status:Available"
-#~ msgstr "?стан користувача:Доступний"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "?стан контакту:Невідомий"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "?стан контакту:З помилками"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "?Підписка яку ми вже маємо:Жодної"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "?Запит (на підписку):Немає"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "?Роль у груповій балачці:Немає"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "?Членство контакту у груповій балачці:Жодного"
-
-#~ msgid "?print_status:All"
-#~ msgstr "Всі"
-
-#~ msgid "?print_status:None"
-#~ msgstr "Жодного"
-
-#~ msgid "?features:Available"
-#~ msgstr "?features:Доступний"
-
-#~ msgid "?CLI:account"
-#~ msgstr "?CLI:обліковий запис"
-
-#~ msgid "?CLI:status"
-#~ msgstr "?CLI:стан"
-
-#~ msgid "?CLI:message"
-#~ msgstr "?CLI:повідомлення"
-
-#~ msgid "?CLI:priority"
-#~ msgstr "?CLI:пріоритет"
-
 #~ msgid "?CLI:uri"
 #~ msgstr "?CLI:uri"
 
@@ -11054,33 +11330,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgstr "?CLI:пароль"
 
 #, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "Групові балачки"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "Звантажити"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "Вивантажити"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "Призупинено"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "?Клієнт:Невідомий"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "?ОС:Невідома"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "?Час:Невідомий"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "?Роль в груповій балачці:<b>Роль:</b>"
-
-#, fuzzy
 #~ msgid "Credentials"
 #~ msgstr "Облікові дані Oauth2"
 
@@ -11301,9 +11550,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Choose _Key..."
 #~ msgstr "Обрати _ключ..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Використовувати _агент GnuPG"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
@@ -11452,18 +11698,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>Ввід XML</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "Фільтр:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>Ввід XML</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "_Надіслати"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "Консоль XML для %s"
 
@@ -11949,9 +12183,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(Відомості <b>ESession</b>)"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "Введіть JID або ім’я контакту"
 
@@ -11967,13 +12198,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "homepage url"
 #~ msgstr "адреса домашньої сторінки"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>someone@somewhere.com</b> бажає <b>додати</b> до вашого реєстру де-які "
-#~ "контакти."
-
 #~ msgid "More"
 #~ msgstr "Більше"
 
@@ -11995,13 +12219,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "Please check if avahi/bonjour-daemon is running."
 #~ msgstr "Будь ласка, переконайтеся, що запущено фонову службу avahi."
 
-#~ msgid ""
-#~ "<b>Message was corrected. Last message was:</b>\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "<b>Повідомлення було відредаговане. Останнє повідомлення було:</b>\n"
-#~ "   %s"
-
 #~ msgid "%s is not the name of a group chat."
 #~ msgstr "%s не є назвою групової балачки."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ec3e8bed6..013993f94 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2010-10-31 17:37+0800\n"
 "Last-Translator: Guanhao Yin <yinguanhao@gmail.com>\n"
 "Language-Team: \n"
@@ -28,20 +28,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "错误。"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "确定要发送文件?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "如果您想 %s 发送文件, 他/她会获知您的真实 Jabber ID。"
@@ -98,70 +98,70 @@ msgstr "时间"
 msgid "Progress"
 msgstr "进程"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "文件名:  %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "大小:  %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "您"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者:  %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "接收者:  %s"
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存在:  %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "文件传输已完成"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "打开文件夹(_O)"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "文件传输已取消"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "无法与对方建立连接。"
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者:  %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "错误消息: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "文件传输已停止"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -169,126 +169,126 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "选择要发送的文件..."
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "描述: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim 无法访问此文件"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "无法覆盖现有文件\"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "文件名已经存在且您没有权限覆盖它。"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "想做什么?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "另存为..."
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "文件:  %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "类型: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "描述:  %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件: "
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "发送名片..."
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "文件传输错误"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "无效文件"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "文件: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "名称: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "发送者: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "暂停"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "继续(_C)"
 
@@ -446,89 +446,119 @@ msgstr ""
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "需要 python-gnome2。"
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "可用"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "特性"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "读文件错误: "
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "分析文件错误: "
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "不支持扩展"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "图片不能被保存为 %(type)s 格式。保存为 %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "图片另存为..."
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "有"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "未知"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "未知"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "未知"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "?Role in Group Chat:<b>角色</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>归属: </b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr "此联系人对您的状态信息感兴趣, 但您不关心他/她的状态"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr "您对此联系人的状态信息感兴趣, 但他/她不关心您的状态"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "没有未处理的认证请求"
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "所有文件"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "清洁"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "管理代理服务器设置"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -571,13 +601,13 @@ msgid "_New Group Chat"
 msgstr "新聊天室(_N)"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "不在联系人列表中"
 
@@ -590,7 +620,7 @@ msgstr "我希望将您添加到我的联系人列表"
 msgid "Send Single _Message…"
 msgstr "发送单条消息(_M)"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "发送个性化状态(_T)"
@@ -608,25 +638,25 @@ msgstr "管理代理(_M)"
 msgid "_Modify Transport"
 msgstr "修改代理(_M)"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "重命名(_R)"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "解除屏蔽(_U)"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "屏蔽(_B)"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "移除(_R)"
@@ -640,211 +670,231 @@ msgstr "信息(_I)"
 msgid "Send File..."
 msgstr "发送文件(_F)..."
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "邀请联系人(_C)"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "添加至联系人列表(_A)"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "音频测试"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "视频测试"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "信息(_I)"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "历史(_H)"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "管理聊天室(_M)"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "更改主题(_S)"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "设置聊天室(_R)"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "删除聊天室(_D)"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "更改昵称(_N)"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "将本聊天室加入书签(_B)"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "语音(_V)"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "预设的消息: "
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "关闭时最小化窗口"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "执行命令(_E)..."
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "断开连接(_D)"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "加入多人聊天"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "添加联系人(_A)..."
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "文件"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "发现服务(_D)"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "发送单条消息...(_S)"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "高级"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "编辑存档首选项(_V)"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "同步"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "隐私策略列表"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "服务器"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr " XML 控制台"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "管理(_A)"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "发送服务器消息(_S)"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "设定 MOTD..."
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "更新 MOTD..."
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "删除 MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "没有有效账户"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "账户"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "message"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "表情(_E): "
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "日期"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "昵称"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "消息"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "主题"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您确定要清除数据库?（强烈建议 GAJIM 运行时不要进行此操作）"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -858,96 +908,96 @@ msgstr ""
 "\n"
 "如果您点击\"是\", 请等待..."
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 #, fuzzy
 msgid "Database Cleanup"
 msgstr "数据库错误"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "输出历史记录..."
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说:  %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "您确定要删除所选定的消息?"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "您确定要删除所选定联系人的历史记录?"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "找不到该服务"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 #, fuzzy
 msgid "Deletion Confirmation"
 msgstr "取消确认"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您确定要删除所选定的消息?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "正在获取名片..."
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "错误的数据格式"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "日期的格式必须是 YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "信息已收到"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "没有连接的情况下您无法发布您的联系人信息。"
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "发送名片..."
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "信息没有发布"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -963,10 +1013,10 @@ msgstr "联系人名称: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID:  <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "常规"
@@ -1052,36 +1102,36 @@ msgstr "请填入您想添加到账户 %s 的联系人的信息"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想添加的联系人的信息"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "无效的用户ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "用户ID不应包含资源。"
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "您不能将您自己添加到您的联系人列表中。"
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "联系人已经在联系人列表中"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已经在您的联系人列表中了"
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "用户 ID: "
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "添加服务错误。 %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1089,50 +1139,50 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ 版本: "
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK 版本: "
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "当前的开发者: "
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "既往开发者: "
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "最后但不是最不重要的, 我们要感谢所有的软件包维护者。"
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
@@ -1140,12 +1190,12 @@ msgstr ""
 "jeanet <qianxiaojun604@gmail.com>\n"
 "Guanhao Yin <yinguanhao@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "语言 %s 的词典不可用"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1157,12 +1207,12 @@ msgstr ""
 "言。\n"
 "高亮拼写错误的特性不会被启用。"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "不安全的连接"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1173,488 +1223,512 @@ msgstr ""
 "您将通过一个不安全的连接连接服务器。这意味着您的所有对话都会不经加密地被交"
 "换。您确定要这样做吗?"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "是的, 我确实想要不安全地连接"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "不要再问我了(_D)"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr ""
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr ""
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "无效的昵称"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "昵称包含不合法字符。"
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "认证请求"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(jid)s 对账户 %(account)s 的认证请求"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s 的认证请求"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "加入多人聊天"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "无效聊天室"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "不合法的昵称"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "请用您想要的名字新建一个主题。"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "无效的 JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "您必须连接才能加入聊天室。"
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "错误的 uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "这不是一个聊天室"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未连接时, 您不能同步您的联系人。"
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "名称"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "服务器"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "这个账户已经连接到服务器"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "这个账户连接后您才可以与之同步"
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "同步"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "继续对话"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "新聊天室"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "添加联系人"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "您必须输入密码"
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "密码不匹配"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "在两个输入框中输入的密码必须一致。"
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "新消息"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "新单条消息"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "新个人消息"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "新电子邮件"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "多人聊天邀请"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "联系人状态改变"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "单条消息, 使用账户 %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "单条消息, 在账户 %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "单条消息"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "来自 %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认您已经连接到 \"%s\"。"
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "不能向 %s 发送消息, 无效的 JID。"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "回复: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道: \n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "清洁"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "过滤器: "
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML 输入</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "发送(_S)"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "添加"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "修改"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "移除"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些联系人。"
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "添加"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "修改"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "删除"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "群组"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s 建议我将您添加到我的联系人列表。"
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "添加了 %s 联系人"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "移除了 %s 联系人"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s 的存档首选项"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "%s 的存档首选项"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "有一处错误"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "错误"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "隐私策略列表 <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的隐私策略列表"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "隐私策略列表"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "顺序: %(order)s, 动作: %(action)s, 类型: %(type)s, 值: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "顺序: %(order)s, 动作: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>编辑规则</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>添加规则</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的隐私策略列表"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "不合法的列表名"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个隐私策略列表。"
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "您被邀请到一个聊天室"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact 邀请您加入一个聊天室"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact 邀请您参加聊天室 %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "注释: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "您是否接受邀请?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "选择客户端证书 #PCKS12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "PKCS12 文件"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "选择图像"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "图像"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "选择归档文件"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "Zip 文件"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为: "
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊提示"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "一个音频和视频"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "一个音频"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "一个视频"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s 想要与您发起一个 %(type)s 会话。您要响应吗?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, fuzzy, python-format
 msgid "Certificate for account %s"
 msgstr "帐户 %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1678,67 +1752,95 @@ msgid ""
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL证书错误"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
 msgstr ""
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "文件传输"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E 加密被禁用"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s 现在成了 %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在聊天室\"%(room)s\"中或\"%(nick)s\"已离开。"
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "您的服务器不支持存储元联系人信息"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "请指定新话题: "
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称: "
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "无效的聊天室 Jabber ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "聊天室 Jabber ID 包含不合法字符。"
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "正在销毁 %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1747,270 +1849,280 @@ msgstr ""
 "您正要彻底销毁这个聊天室。\n"
 "您可以在下面指定一个原因: "
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "您也可以输入一个可选的替代地点: "
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "且已被认证"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "且未被认证"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s 加密 %(status)s 活动 %(authenticated)s。\n"
 "您的聊天会话 %(logged)s 将被记录。"
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "对话, 与"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "继续对话"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, fuzzy, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(jid)s 将主题设置为 %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "所有房主可以看到您的全部 JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "聊天室现在显示了不可用的成员"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "聊天室现在不显示不可用的成员"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "聊天室消息记录已启用"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "聊天室消息记录已禁用"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "聊天室现在是非匿名的"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "聊天室现在是半匿名的"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "聊天室现在是完全匿名的"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s 已经被从这个聊天室移除(%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "聊天室记录被启用"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "一个新的聊天室被创建"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "服务器指定或修改了您的聊天室昵称"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 踢出: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 已经被从这个聊天室移除(%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "归属变更"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "聊天室配置变为\"仅成员\""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "系统关闭"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(nick)s 的归属被 %(actor)s 设置为 %(affiliation)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s 的归属被设置为 %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s 的角色被 %(actor)s 设置为 %(role)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s 的角色被设置为 %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s 离开了"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "您确定要离开聊天室\"%s\"吗?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口, 您将断开此聊天室的连接。"
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "将踢走 %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因: "
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "将封禁 %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "文件传输"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "文件传输完毕"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "显示格式列表(Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "这个联系人不支持文件传输"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 状态: %(state)s, 原因: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "聊天室 %(room_name)s 的 %(nickname)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "会话协商已取消"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "本次会话将在服务器上被存档"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "本次会话将不会在服务器上被存档"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "本次会话已被加密"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr "且会被记录"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr "且不会被记录"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "远程联系人的身份未确认。点击盾型按钮查看详情。"
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E 加密被禁用"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "您刚刚收到一条来自 \"%s\" 的消息"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用了历史, 此消息会丢失。"
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2019,7 +2131,7 @@ msgstr ""
 "主题: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2028,96 +2140,96 @@ msgstr ""
 "无法解密来自 %s 的消息\n"
 "它可能被篡改了。"
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s 的状态是 %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "文件传输"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "大小:  %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "帐户(_A)"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "远程联系人停止了传输"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "打开文件错误"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "多人聊天"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "服务代理"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "授权发送成功"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "现在\"%s\"将知道您的状态。"
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果\"%s\"接受此请求, 您将知道他/她的状态。"
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "授权被移除"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 将一直看到您的状态为离线。"
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG 不可用"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2125,47 +2237,47 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "您正在参与一个或多个多人聊天"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr "隐身将使您从这些聊天室中断开。确定要隐身?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "未同步"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "真得要退出 Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "您确定您要退出 Gajim 吗?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "总是关闭 Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "您有正在传输的文件"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "如果现在退出, 正在传输的文件会停止传输。您仍然要退出吗?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2173,93 +2285,93 @@ msgstr ""
 "除非您启用了历史记录而且向您发送消息的联系人在您的联系人列表中, 您才能\n"
 "在以后读到这些消息。"
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "在移除代理之前您必须阅读它们。"
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理\"%s\"将被移除"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您将无法再和使用这个代理的联系人收发消息。"
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "您无法再和来自这些代理的联系人收发消息: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您将要屏蔽一个联系人。您确定要继续吗?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr "这个联系人将看到您离线并且您不会在收到他发送给您的消息。"
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想从联系人列表中删除组 %s ?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同时从联系人列表移除这个群组的所有联系人"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "指定 OpenPGP 密钥"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "选择一个对应于该联系人的密钥。"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人\"%s\"将从您的联系人列表中被移除"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "您将从您的联系人列表中将 \"%(name)s\" (%(jid)s) 移除。\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2268,26 +2380,26 @@ msgstr ""
 "移除这些联系人: %s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "您要继续吗?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in them always seeing you as offline."
 msgstr "移除此联系人的同时将默认移除认证, 导致他/她将一直看到您为离线。"
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "联系人将从您的联系人列表中被移除"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2296,13 +2408,13 @@ msgstr ""
 "移除这些联系人: %s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "您将发送一个自定义的状态。您确定要继续吗?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2311,24 +2423,24 @@ msgstr ""
 "这个联系人会暂时看到您的状态为 %(status)s, 直到您下次改变您的状态。之后\n"
 "他/她会看到您的全局状态。"
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "隐身时无法加入聊天室"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持存储元联系人信息"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2336,12 +2448,12 @@ msgid ""
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时不会被保存。"
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2350,192 +2462,192 @@ msgstr ""
 "元联系人是将几个联系人组合起来显示在同一行。通常在某个人有几个 Jabber\n"
 "账户或代理账户时用到。"
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "无效的文件地址: "
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "您想要将文件发送给 %s 吗: "
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "发送 %s 给 %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, fuzzy, python-format
 msgid "Make %s first contact"
 msgstr "由 %s 与 %s 创建元联系人"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "由 %s 与 %s 创建元联系人"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "发布音乐"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "发布位置信息"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "配置服务..."
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "最大化全部(_M)"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "向所有在线用户"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "管理联系人(_M)"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "编辑群组(_G)"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "最大化(_M)"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "断开连接(_D)"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "历史(_H)"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "历史记录管理器"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "加入新的聊天室(_J)"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "更改状态消息(_C)"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "在通知区域显示图标: "
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "只显示在联系人列表中"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "高级设置编辑器"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s 设置错误"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "显示所有未处理事件(_E)"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "数据库错误"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "想做什么?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "正在连接"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "转发未读消息"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2544,7 +2656,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2552,7 +2664,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2697,16 +2809,16 @@ msgstr "账户被禁用"
 msgid "To unregister from a server, account must be enabled."
 msgstr "要从服务器移除注册, 账户必须被启用。"
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "需要密码"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "保存密码"
 
@@ -2736,10 +2848,18 @@ msgstr "仅从 Gajim 移除帐户"
 msgid "Don't remove anything. I'll try again later"
 msgstr "不要移除任何东西。我过一会儿会再试一下"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "全部"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "只是进入和离开"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "无"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "新聊天室"
@@ -2803,11 +2923,11 @@ msgstr "无效输入"
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "证书已经在文件中"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "证书已经在文件 %s 中, 所以它没有被再次添加。"
@@ -2911,90 +3031,112 @@ msgstr "多人聊天消息突出显示"
 msgid "Group Chat Message Received"
 msgstr "收到的多人聊天消息"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此聊天室的 %(owner_or_admin_or_member)s"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "无"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "成员"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "管理员"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "所有者"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr "[已屏蔽]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr "[最小化的]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "已连接"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "下载"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "上传"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "类型: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "已传输: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "未开始"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "已停止"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "已完成"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:暂停"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "已冻结"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "传输中"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "状态: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "在线"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "离开"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "忙碌"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "离开很久了"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "离线"
 
@@ -3043,122 +3185,126 @@ msgstr "(无)"
 msgid "Hidden"
 msgstr "隐藏"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "对话历史"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "磁盘错误"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "错误: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "错误"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态:  %(status)s "
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "更改状态消息(_C)"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "书签管理"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "隐藏联系人列表(_R)"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "显示联系人列表(_R)"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "无法载入图像"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "不支持的媒体类型: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "这一项是必须的"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "主机名(_H): "
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "服务器回应: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3314,57 +3460,63 @@ msgstr "订阅(_S)"
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "以下文字是您上次注意这个聊天室以来的聊天内容"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "引用(_Q)"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\"的动作(_A)"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "阅读 Wikipedia 文章(_W)"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "从字典中搜索(_D)"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典地址中缺少 \"%s\" 并且它不是 \"WIKTIONARY\""
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网络搜索地址缺少 \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "在互联网上搜索(_S)"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "无效的 JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3375,30 +3527,35 @@ msgstr[0] "%i天前"
 msgid "Write a message.."
 msgstr "收到一条消息"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "您将要关闭多个标签"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "您确定要关闭所有这些吗"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "多人聊天"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "私聊"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "消息"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "无法加入聊天室"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3409,108 +3566,108 @@ msgstr ""
 "您在聊天室 %s 中希望使用的昵称已经被使用或被其他人注册了。\n"
 "在下面指定另一个昵称: "
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "在发生冲突时总是使用这个昵称"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受这个对账户 %s 的请求?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "%(url)s (id: %(id)s) 的 HTTP (%(method)s) 认证"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "需要密码才能加入聊天室 %s。请输入一个密码。"
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>字体</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, fuzzy, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "您被聊天室 %s 封禁。"
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "聊天室 %s 不存在。"
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, fuzzy, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "聊天室 %s 不存在。"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "聊天室创建是受限的。"
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "无法加入聊天室"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "您在聊天室 %s 中注册的昵称必须被使用。"
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不再聊天室 %s 的成员列表中。"
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "错误 %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "发送 %(message)s 时出现错误( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "认证请求"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "旁观者"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人\"%s\"已授权您查看他/她的状态。"
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人\"%s\"移除了对您的认证"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3519,31 +3676,31 @@ msgstr ""
 "您将一直看到他/她处于离线状态。\n"
 "要将他/她从您的联系人列表中移除吗?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "已取消认证的"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与\"%s\"建立连接"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "检查连接或稍后再试。"
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3552,132 +3709,137 @@ msgstr ""
 "您配置了 Gajim 使用 GPG agent, 但并没有正在运行的 GPG agent 或者它返回了一个"
 "错误的密码。\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "您已经连接, 但没有使用您的 OpenPGP 密钥。"
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "错误字段"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "错误字段"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 #, fuzzy
 msgid "Certificate Passphrase Required"
 msgstr "证书已过期"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "输入 GPG密钥 %(keyid)s (账户 %(account)s) 的密码。"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "选择您的 OpenPGP 密钥"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr "用于加密这次对话的 GPG 密钥未被信任。您确实想要加密这条消息吗?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL证书错误"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "文件传输完毕"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "选择要发送的文件..."
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "无法解密消息"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "<b>请在您本地账户填写新的用户名</b>"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "您已经用同一个资源连接到这个账户了。请输入一个新的资源"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要发起语音聊天。"
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "语音聊天请求"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "验证 SSL 证书出错"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3688,7 +3850,7 @@ msgstr ""
 "%(error)s\n"
 "您仍然想要连接这个服务器吗?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3701,15 +3863,15 @@ msgstr ""
 "这个证书的 SHA1 指纹信息: \n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "忽略这个证书的这个错误。"
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3729,7 +3891,7 @@ msgstr ""
 "\n"
 "您仍想连接并更新证书的指纹信息吗?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3737,39 +3899,39 @@ msgstr ""
 "您将通过不安全的连接发送密码。您应该安装 PyOpenSSL 以阻止这样的事情。您确定要"
 "这样做吗?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "您将通过不安全的连接发送未经加密的密码。您确定要这样做吗?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "这不是一个聊天室"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "表情图标被禁用"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "您配置的表情图标主题未找到, 所以表情图标被禁用。"
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr "您配置的表情图标主题未找到, 所以表情图标被禁用。"
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "这不是一个聊天室"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3777,41 +3939,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "默认"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "输入 GPG密钥 %(keyid)s (账户 %(account)s) 的密码。"
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG密钥过期"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "您的 GPG密钥已过期, 您将在没有 OpenPGP 情况下连接到 %s。"
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点\"取消\""
@@ -3881,6 +4043,11 @@ msgstr "- 消息将会被记录"
 msgid "- messages will not be logged"
 msgstr "- 消息将不会被记录"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3910,7 +4077,7 @@ msgstr "不合法的格式"
 msgid "The form is not filled correctly."
 msgstr "表格没有被正确得填写。"
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "隐身"
 
@@ -4041,6 +4208,56 @@ msgstr ""
 "%s\n"
 "Link-local 消息可能无法正常工作。"
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "无法启动本地服务"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "无法读取图片"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "服务返回了一个错误。"
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "无法读取图片"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "一个连接不可用"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "主题"
@@ -4066,7 +4283,17 @@ msgstr "无法删除当前主题"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "已合并的帐户"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "使用 G_PG Agent"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "很快回来。"
 
@@ -4087,6 +4314,11 @@ msgstr "您已在账户 %s 打开聊天"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和多人聊天窗口将会关闭。您想继续吗?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "移除(_R)"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4282,49 +4514,63 @@ msgstr "更改密码"
 msgid "Login Options"
 msgstr "表情(_E): "
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "在这台计算机上没有 D-Bus 或者 Python 模块缺失"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "为特定命令显示帮助"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "命令"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "为命令显示帮助"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "显示/隐藏联系人列表窗口"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "为下一条未处理事件弹出窗口"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr "打印联系人列表中所有联系人。每个联系人一行。"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "账户"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "改变一个或多个账户状态"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "状态"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4332,26 +4578,37 @@ msgstr ""
 "下列之一: offline, online, chat, away, xa, dnd, invisible。如果没有设置, 使用"
 "账户先前的状态"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "状态消息"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr "改变账户的状态。如果不指明, 将改变设置\"与全局同步\"选项的账户"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "改变一个或多个账户的优先级"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "优先级"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "您想要给予这个账户的优先级"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4359,7 +4616,7 @@ msgstr ""
 "改变指定账户的优先级。如果不指明, 将改变所有设置了\"与全局状态同步\"选项的账"
 "户"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4368,29 +4625,29 @@ msgstr ""
 "发送新聊天消息至联系人列表中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择"
 "\"帐户\"而不需要\" OpenPGP 密钥\", 只需将\" OpenPGP 密钥\"置为空。"
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "消息内容"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定, 该消息将使用本公共密钥加密"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定, 消息将被用此账户发送"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4399,151 +4656,151 @@ msgstr ""
 "发送新聊天消息至联系人列表中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择"
 "\"帐户\"而不需要\" OpenPGP 密钥\", 只需将\" OpenPGP 密钥\"置为空。"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "主题"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "消息主题"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "向一个您加入的聊天室发送新消息。"
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "要收到这条消息的聊天室的 JID"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "获得账户的详细信息"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "账户名称"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "文件"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "文件路径"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "如指定, 文件将被用此账户发送"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "将\"密钥\"的值设为\"值\""
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "键=值"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "\"密钥\"是参数名, 而\"值\"是赋予参数的数值"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "键"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "从联系人列表移除联系人"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定, 将从此帐户列表下移出联系人"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "返回未读消息数"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "发送自定义 XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "发送 XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr "XML 将被发送的账户; 如果不指定, XML 将被发送至所有账户"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "改变头像"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "要使用的图片"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr "要设置为这个头像的账户; 如果不指定, 所有账户都将被设置为这个头像。"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "请检查 Gajim 是否正在运行"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "显示/隐藏 ipython 窗口"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"联系人 JID\"参数"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4552,15 +4809,15 @@ msgstr ""
 "\"%s\" 不在您的联系人列表中。\n"
 "请为发送此消息指定账户。"
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "似乎 Gajim 不在运行。因此您无法使用 gajim-remote。"
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4569,16 +4826,16 @@ msgstr ""
 "用法: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "参数: "
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4589,7 +4846,7 @@ msgstr ""
 "用法: %s 命令 [参数] \n"
 "命令是下列之一: \n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4598,7 +4855,7 @@ msgstr ""
 "参数太多。\n"
 "输入 \"%(basename)s help %(command)s\" 获取更多信息"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4772,11 +5029,6 @@ msgstr "一周末"
 msgid "Weekend!"
 msgstr "周末"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP 帐户 %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4800,52 +5052,52 @@ msgstr "聊天室已经被销毁了"
 msgid "You can join this room instead: %s"
 msgstr "作为替代, 您可以加入这个聊天室: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知的 SSL 错误: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 发来的新消息"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "来自聊天室 %s 的私人消息"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s:  %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "来自 %(nickname)s 的消息"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 改变了状态"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上线了"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 离开了"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "不在联系人列表中"
 
@@ -5603,78 +5855,76 @@ msgstr "为这个账户启用 ESession 加密。"
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim 是否应该在可能时自动发起加密的会话?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
-msgstr "应尝试的连接类型的有序列表(用空格分隔)。可以包含 tls, ssl, 或 plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
+msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr "在使用明文连接发送密码前显示一个警告对话框。"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "在使用标准 SSL 库前显示一个警告对话框。"
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "在通过明文连接明文发送密码前显示一个警告对话框。"
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "应忽略的 SSL 错误列表, 以空格分隔"
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "在不活动后发送的空白"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "在不活动后发送的 XMPP ping"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr "在重新连接前等待 ping alive packet 的回应多少秒"
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "为 Jabberd2 变通"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5682,101 +5932,111 @@ msgstr ""
 "如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文"
 "件传输。"
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "对回执请求的回应"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "发送回执请求"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 #, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 #, fuzzy
 msgid "Allow Gajim to send your local time."
 msgstr "%s 想发送给您一个文件。"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr "在协商加密的会话时, Gajim 是否应该假设您想要您的消息被记录?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "向您希望添加的联系人发送的消息"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "匿名认证"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "匿名认证(_Y)"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "匿名认证(_Y)"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "想要进行拼写检查的语言"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr "当加入聊天室时向服务器请求聊天记录的行数。"
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr "当加入聊天室时请求多少分钟以内的聊天记录。"
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 #, fuzzy
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
@@ -5786,106 +6046,106 @@ msgstr ""
 "表述在退出时是否激活插件(在 Gajim 退出时这会被保存)。这个选项不应该用于激活或"
 "禁用插件。使用图形界面代替。"
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "马上回来"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "几分钟就回来。"
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "吃东西"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "我在吃东西, 请留言"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "电影"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "我正在看电影。"
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "打电话"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "我正在打电话"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "外出"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "我已经很久不在了。"
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "请勿打扰。"
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "再见!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 "当收到的多人聊天消息包含 \"muc_highlight_words\" 或您的昵称时播放的声音。"
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "收到任意多人聊天消息播放的声音。"
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "绿色"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "杂货店"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "人类"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "海洋"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "To"
@@ -5963,36 +6223,49 @@ msgstr "所有未读消息都已被转发。"
 msgid "Forward unread message then disconnect"
 msgstr " 转发未读消息然后断开连接"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "文件为空"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "文件不存在"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "建立缓存数据库"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "发送 %s 给 %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 是一个文件但它应该是一个目录"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一个目录但它应该是一个文件"
@@ -6002,11 +6275,11 @@ msgstr "%s 是一个目录但它应该是一个文件"
 msgid "Error: cannot open %s for reading"
 msgstr "错误: 无法按读打开文件 %s"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "青色"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "迁移记录数据库到索引"
 
@@ -6015,188 +6288,188 @@ msgstr "迁移记录数据库到索引"
 msgid "%s is not a valid loglevel"
 msgstr "%s 不是一个合法的日志级别"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "无法获得发行者的证书"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "无法获得证书吊销列表"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "无法解密证书签名"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "无法解密证书吊销列表的签名"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "无法解码发行者的公钥"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "证书签名失败"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "吊销证书列表签名失败"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "证书还未生效"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "证书已过期"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "证书吊销列表还未生效"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "证书吊销列表已过期"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "格式错误, 在证书的'不早于'字段"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "格式错误, 在证书的'不迟于'字段"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式错误, 在证书吊销列表的'最后更新'字段"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式错误, 在证书吊销列表的'下次更新'字段"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "内存耗尽"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "自签名的证书"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "自签名的证书, 在证书链中"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "无法获得本地发行者证书"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "无法验证第一个证书"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "证书链太长"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "证书已被吊销"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "无效的 CA 证书"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "超过了路径长度限制"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "不支持的证书用途"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "不被信任的证书"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "证书被拒绝"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Subject 与 发行者 不匹配"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 与 subject key identifier 不匹配"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 与 发行者序列号 不匹配"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "密钥用途中不包含证书签名"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "应用程序验证失败"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户\"%s\"的连接丢失"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "手动重连。"
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务器 %(name)s 对注册请求的响应有误: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "服务器 %s 提供了一个不同的注册表单"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "没有能够连接到\"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "没有能够连接到\"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "服务器回应: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "连接代理服务器失败"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "没有能够连接到账户 %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帐户 %s 的连接丢失。重新尝试连接。"
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s 证书的认证可能是无效的"
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6205,7 +6478,7 @@ msgstr ""
 "\n"
 "SSL 错误: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6214,38 +6487,38 @@ msgstr ""
 "\n"
 "未知 SSL 错误: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "%s 证书的认证可能是无效的"
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "没有能够连接到\"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\"登录验证失败"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "已发送联系人: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "已发送联系人: "
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态, 未获取"
 
@@ -7121,256 +7394,280 @@ msgstr "视频输入"
 msgid "video output"
 msgstr "视频输出"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "服务器名必须在 1 到 1023 个字符之间"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "主机名中有无效的字符。"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "服务器的地址是必须的。"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "用户名必须在 1 到 1023 个字符之间"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "在用户名中有无效的字符。"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "资源必须在 1 到 1023 个字符之间"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "资源中含有无效字符。"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "离开很久了(_N)"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "在线(_A)"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "正在连接"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "未知"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "有错误"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "无"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "To"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "From"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Both"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "无"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "认证"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "无"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "参与者"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "参与者"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "访客"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "访客"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "注意着与您的对话"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "正在输入消息..."
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "暂停输入消息"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 条消息未处理"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " 来自聊天室 %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " 来自用户 %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " 来自 %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 个未处理事件"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "我想添加您到我的联系人列表"
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "您好, 我是$name"
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "读取文件超时"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "图片太大"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "证书吊销列表还未生效"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "读取文件超时"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 的注册信息未按时抵达"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "message"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "我想将您添加到我的联系人列表。"
 
@@ -7406,43 +7703,43 @@ msgstr ""
 "系统总线不可用。\n"
 "请参考 %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "请检查 Avahi 或者 Bonjour 是否已经安装。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "无法启动本地服务"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "无法绑定端口 %d。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "请检查 avahi-daemon 是否正在运行。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "无法改变账户\"%s\"的状态"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "您的消息未能被发送。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "联系人离线。您的消息未能被发送。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "无法建立到主机的连接: 发送数据超时。"
@@ -7681,6 +7978,11 @@ msgstr "封禁(_B)"
 msgid "_Add to Roster"
 msgstr "添加至联系人列表(_A)"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "执行命令(_E)..."
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -7962,11 +8264,11 @@ msgstr "关于"
 msgid "Con_tinue"
 msgstr "继续(_C)"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "暂停(_P)"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -7975,31 +8277,31 @@ msgstr "取消(_C)"
 msgid "_Open Containing Folder"
 msgstr "打开文件夹(_O)"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "文件传输"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "文件传输列表"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "正在传输, 传输完成和停止传输的文件列表"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "清除(_U)"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "从列表移除已完成, 已取消和失败的文件传输"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "从列表中移除文件传输。"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8007,32 +8309,37 @@ msgstr ""
 "该操作会从列表中移除单个文件传输。如果传输正在进行, 它将先被终止, 而后\n"
 "被移除"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "取消选定文件传输并删除未完成文件"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "取消文件传输"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "取消选定文件的传输"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "发送并关闭(_S)"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "隐藏该窗口"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "文件传输完成时提醒我(_N)"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "当文件传输完成时弹出提示"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "显示您与他人进行的传输文件列表"
 
@@ -8041,7 +8348,7 @@ msgid "Register to"
 msgstr "注册到"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "确定(_O)"
 
@@ -8072,20 +8379,20 @@ msgstr "字体"
 msgid "Clear formatting"
 msgstr "清楚格式"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "显示表情列表(Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "选择客户端证书"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "显示表情列表(Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "事件类型"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "事件"
 
@@ -8147,7 +8454,7 @@ msgstr "<b>字体</b>"
 msgid "<b>#</b>"
 msgstr "<b>字体</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -8861,10 +9168,6 @@ msgstr "打开...(_O)"
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>高级配置编辑器</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "高级"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "开始聊天(_C)"
@@ -9106,7 +9409,7 @@ msgid "_Open Email Composer"
 msgstr "打开邮件编辑器(_O)"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "开始聊天(_S)"
 
@@ -9151,6 +9454,10 @@ msgstr "参数"
 msgid "Default:"
 msgstr "默认"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "添加联系人"
@@ -9176,6 +9483,16 @@ msgstr "昵称(_N): "
 msgid "_Group:"
 msgstr "群组(_G): "
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "用户 ID: "
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "昵称"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9212,6 +9529,11 @@ msgstr ""
 "您必须连接才能\n"
 "增加此协议的联系人。"
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "更改状态消息(_C)"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>心情: </b>"
@@ -9428,10 +9750,9 @@ msgstr "执行命令(_E)..."
 msgid "_Verify"
 msgstr "辨别(_V)"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "账户"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "<b>ESession</b>信息"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9458,11 +9779,6 @@ msgstr "只显示活动的联系人(_A)"
 msgid "Show Transports"
 msgstr "显示代理(_P)"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "文件传输"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9535,48 +9851,33 @@ msgstr "自动加入时最小化"
 msgid "Pr_int status:"
 msgstr "显示状态: "
 
-#: gajim/data/gui/exception_dialog.ui:7
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Exception"
-msgstr "描述"
+msgid ""
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
+msgstr "它可能不是致命的, 但仍应该被报告给开发者们。"
 
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:115
 #, fuzzy
 msgid "Report Bug"
 msgstr "报告错误(_R)"
 
-#: gajim/data/gui/exception_dialog.ui:89
-#, fuzzy
-msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
-msgstr "它可能不是致命的, 但仍应该被报告给开发者们。"
-
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "认证请求"
-
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "拒绝向联系人授权则他/她将无法知道您是否在线"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "动作(_A)"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "授权(_T)"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "向联系人授权则他/她将知道您是否在线"
 
@@ -9594,11 +9895,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Presence"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "邀请朋友!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9607,15 +9908,20 @@ msgstr ""
 "您将开始进行多人聊天。\n"
 "选择您想要邀请的联系人"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "请选择一个多人聊天服务器"
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "多人聊天服务器"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "邀请(_V)"
 
@@ -9733,11 +10039,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "清洁"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -9899,6 +10200,15 @@ msgstr "显示所有未处理事件(_E)"
 msgid "Mute Sounds"
 msgstr "静音"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "参数"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr ""
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "到: "
@@ -10299,14 +10609,6 @@ msgstr ""
 msgid "Configuration"
 msgstr "聊天室设置"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber 即时消息客户端"
@@ -10432,6 +10734,29 @@ msgid "Plugin manager"
 msgstr "注册失败"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP 帐户 %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "描述"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>someone@somewhere.com</b> 希望您向您的联系人列表 <b>添加</b> 一些联系"
+#~ "人。"
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr "应尝试的连接类型的有序列表(用空格分隔)。可以包含 tls, ssl, 或 plain"
+
+#~ msgid "_Actions"
+#~ msgstr "动作(_A)"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "需要 python-dbus。"
 
@@ -10630,12 +10955,6 @@ msgstr "注册失败"
 #~ msgid "Hide all buttons in chat windows"
 #~ msgstr "在聊天窗口中隐藏所有按钮"
 
-#~ msgid "File is empty"
-#~ msgstr "文件为空"
-
-#~ msgid "File does not exist"
-#~ msgstr "文件不存在"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10662,55 +10981,6 @@ msgstr "注册失败"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "需要 python-pyopenssl。"
 
-#~ msgid "?user status:_Available"
-#~ msgstr "在线(_A)"
-
-#~ msgid "?user status:Available"
-#~ msgstr "在线"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "未知"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "有错误"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "无"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "无"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "无"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "无"
-
-#~ msgid "?print_status:All"
-#~ msgstr "全部"
-
-#~ msgid "?print_status:None"
-#~ msgstr "无"
-
-#~ msgid "?features:Available"
-#~ msgstr "可用"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "账户"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "状态"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "message"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "优先级"
-
 #, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "聊天室"
@@ -10723,33 +10993,6 @@ msgstr "注册失败"
 #~ msgid "?CLI:password"
 #~ msgstr "密码"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "多人聊天"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "下载"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "上传"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:暂停"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "未知"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "未知"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "未知"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "?Role in Group Chat:<b>角色</b>"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "使用 D-Bus 和通知进程显示通知"
 
@@ -10939,9 +11182,6 @@ msgstr "注册失败"
 #~ msgid "Choose _Key..."
 #~ msgstr "选择密钥(_K)..."
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "使用 G_PG Agent"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr "如果选定, Gajim 会从一个 GPG agent （比如 Seahorse）得到密码"
@@ -11076,18 +11316,6 @@ msgstr "注册失败"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML 输入</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "过滤器: "
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML 输入</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "发送(_S)"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "账户 %s 的 XML 控制台"
 
@@ -11549,9 +11777,6 @@ msgstr "注册失败"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>ESession</b>信息"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "输入 JID 或者联系人名"
 
@@ -11567,13 +11792,6 @@ msgstr "注册失败"
 #~ msgid "homepage url"
 #~ msgstr "主页链接"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>someone@somewhere.com</b> 希望您向您的联系人列表 <b>添加</b> 一些联系"
-#~ "人。"
-
 #~ msgid "More"
 #~ msgstr "更多"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 01e40271b..e768f5579 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.15a1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-14 03:05+0000\n"
+"POT-Creation-Date: 2018-02-08 03:05+0000\n"
 "PO-Revision-Date: 2011-09-07 23:11+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -28,20 +28,20 @@ msgstr "Ping?"
 msgid "Error."
 msgstr "錯誤。"
 
-#: gajim/chat_control_base.py:554
+#: gajim/chat_control_base.py:569
 msgid "_Undo"
 msgstr ""
 
-#: gajim/chat_control_base.py:562 gajim/profile_window.py:183
-#: gajim/conversation_textview.py:553
+#: gajim/chat_control_base.py:577 gajim/profile_window.py:181
+#: gajim/conversation_textview.py:550
 msgid "_Clear"
 msgstr ""
 
-#: gajim/chat_control_base.py:1101
+#: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "確定要傳送檔案?"
 
-#: gajim/chat_control_base.py:1102
+#: gajim/chat_control_base.py:1168
 #, fuzzy, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
 msgstr "如果您想 %s 傳送檔案，他/她會獲知您的真實 Jabber ID。"
@@ -98,70 +98,70 @@ msgstr "時間"
 msgid "Progress"
 msgstr "處理序"
 
-#: gajim/filetransfers_window.py:191 gajim/filetransfers_window.py:247
+#: gajim/filetransfers_window.py:223 gajim/filetransfers_window.py:279
 #, python-format
 msgid "Filename: %s"
 msgstr "檔案名稱:  %s"
 
-#: gajim/filetransfers_window.py:192 gajim/filetransfers_window.py:455
+#: gajim/filetransfers_window.py:224 gajim/filetransfers_window.py:485
 #, python-format
 msgid "Size: %s"
 msgstr "大小:  %s"
 
-#: gajim/filetransfers_window.py:201 gajim/filetransfers_window.py:211
-#: gajim/history_manager.py:527
+#: gajim/filetransfers_window.py:233 gajim/filetransfers_window.py:243
+#: gajim/history_manager.py:526
 msgid "You"
 msgstr "您"
 
-#: gajim/filetransfers_window.py:202
+#: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
 msgstr "傳送者:  %s"
 
-#: gajim/filetransfers_window.py:203 gajim/filetransfers_window.py:733
-#: gajim/tooltips.py:781
+#: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
+#: gajim/tooltips.py:654
 msgid "Recipient: "
 msgstr "接收者: "
 
-#: gajim/filetransfers_window.py:214
+#: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
 msgstr "儲存在: %s"
 
-#: gajim/filetransfers_window.py:216 gajim/chat_control.py:1597
+#: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
 msgstr "檔案傳輸已完成"
 
-#: gajim/filetransfers_window.py:218 gajim/chat_control.py:1601
+#: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
 #, fuzzy
 msgid "Open _Containing Folder"
 msgstr "開啟資料夾(_O)"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:238
-#: gajim/chat_control.py:1656
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
+#: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: gajim/filetransfers_window.py:231 gajim/filetransfers_window.py:239
-#: gajim/chat_control.py:1657
+#: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:271
+#: gajim/chat_control.py:1660
 msgid "Connection with peer cannot be established."
 msgstr "無法與對方建立連線。"
 
-#: gajim/filetransfers_window.py:248
+#: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者:  %s"
 
-#: gajim/filetransfers_window.py:250
+#: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
 msgstr "錯誤訊息: %s"
 
-#: gajim/filetransfers_window.py:251 gajim/chat_control.py:1653
+#: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
 msgstr "檔案傳輸已停止"
 
-#: gajim/filetransfers_window.py:287
+#: gajim/filetransfers_window.py:319
 #, python-format
 msgid ""
 "The file %(file)s has been received, but it seems to have been damaged along "
@@ -169,126 +169,126 @@ msgid ""
 "Do you want to download it again?"
 msgstr ""
 
-#: gajim/filetransfers_window.py:315
+#: gajim/filetransfers_window.py:345
 #, fuzzy
 msgid "Choose File to Send…"
 msgstr "選擇要傳送的檔案…"
 
-#: gajim/filetransfers_window.py:325
+#: gajim/filetransfers_window.py:355
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: gajim/filetransfers_window.py:332 gajim/tooltips.py:816
+#: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
 msgstr "描述: "
 
-#: gajim/filetransfers_window.py:345
+#: gajim/filetransfers_window.py:375
 #, fuzzy
 msgid "Gajim can not read this file"
 msgstr "Gajim 無法存取此檔案"
 
-#: gajim/filetransfers_window.py:346
+#: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
 msgstr ""
 
-#: gajim/filetransfers_window.py:391 gajim/gtkgui_helpers.py:515
+#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "無法覆寫現有檔案\"%s\""
 
-#: gajim/filetransfers_window.py:392 gajim/gtkgui_helpers.py:516
+#: gajim/filetransfers_window.py:422 gajim/gtkgui_helpers.py:486
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "檔案名稱已經存在且您沒有權限覆寫它。"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
 msgstr "檔案已經存在"
 
-#: gajim/filetransfers_window.py:409 gajim/gtkgui_helpers.py:520
+#: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
 msgstr "想做什麼?"
 
-#: gajim/filetransfers_window.py:420 gajim/gtkgui_helpers.py:527
+#: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目錄 \"%s\" 不可寫"
 
-#: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:528
+#: gajim/filetransfers_window.py:451 gajim/gtkgui_helpers.py:498
 msgid "You do not have permission to create files in this directory."
 msgstr "您沒有權限在這個目錄裡建立檔案。"
 
-#: gajim/filetransfers_window.py:432
+#: gajim/filetransfers_window.py:462
 #, fuzzy
 msgid "Save File as…"
 msgstr "另存為…"
 
-#: gajim/filetransfers_window.py:452
+#: gajim/filetransfers_window.py:482
 #, python-format
 msgid "File: %s"
 msgstr "檔案:  %s"
 
-#: gajim/filetransfers_window.py:458
+#: gajim/filetransfers_window.py:488
 #, python-format
 msgid "Type: %s"
 msgstr "類型: %s"
 
-#: gajim/filetransfers_window.py:460
+#: gajim/filetransfers_window.py:490
 #, python-format
 msgid "Description: %s"
 msgstr "描述:  %s"
 
-#: gajim/filetransfers_window.py:461
+#: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s 想傳送給您一個檔案:"
 
-#: gajim/filetransfers_window.py:502
+#: gajim/filetransfers_window.py:532
 #, fuzzy
 msgid "Checking file…"
 msgstr "傳送側寫…"
 
-#: gajim/filetransfers_window.py:516
+#: gajim/filetransfers_window.py:546
 #, fuzzy
 msgid "File error"
 msgstr "檔案傳輸錯誤"
 
-#: gajim/filetransfers_window.py:553
+#: gajim/filetransfers_window.py:583
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 
-#: gajim/filetransfers_window.py:646
+#: gajim/filetransfers_window.py:676
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: gajim/filetransfers_window.py:699 gajim/filetransfers_window.py:702
+#: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
 msgstr "無效檔案"
 
-#: gajim/filetransfers_window.py:699
+#: gajim/filetransfers_window.py:729
 msgid "File: "
 msgstr "檔案: "
 
-#: gajim/filetransfers_window.py:703
+#: gajim/filetransfers_window.py:733
 msgid "It is not possible to send empty files"
 msgstr "無法傳送空檔案"
 
-#: gajim/filetransfers_window.py:729 gajim/tooltips.py:772
+#: gajim/filetransfers_window.py:758 gajim/tooltips.py:645
 msgid "Name: "
 msgstr "名稱: "
 
-#: gajim/filetransfers_window.py:731 gajim/tooltips.py:775
+#: gajim/filetransfers_window.py:760 gajim/tooltips.py:648
 msgid "Sender: "
 msgstr "傳送者: "
 
-#: gajim/filetransfers_window.py:898
+#: gajim/filetransfers_window.py:888
 msgid "Pause"
 msgstr "暫停"
 
-#: gajim/filetransfers_window.py:909
+#: gajim/filetransfers_window.py:899
 msgid "_Continue"
 msgstr "繼續(_C)"
 
@@ -446,89 +446,119 @@ msgstr "要求您的路由器於檔案傳送時轉用通訊埠的能力。"
 msgid "Requires gir1.2-gupnpigd-1.0."
 msgstr "需要 python-gupnp-igd。"
 
+#: gajim/features_window.py:94
+msgid "?features:Available"
+msgstr "可用"
+
 #: gajim/features_window.py:101
 msgid "Feature"
 msgstr "特性"
 
-#: gajim/gtkgui_helpers.py:290
+#: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
 msgstr "讀檔案錯誤:"
 
-#: gajim/gtkgui_helpers.py:293
+#: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
 msgstr "分析檔案錯誤:"
 
-#: gajim/gtkgui_helpers.py:501
+#: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
 msgstr "不支援擴充"
 
-#: gajim/gtkgui_helpers.py:502
+#: gajim/gtkgui_helpers.py:472
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "圖片不能被另存為 %(type)s 格式。另存為 %(new_filename)s?"
 
-#: gajim/gtkgui_helpers.py:537
+#: gajim/gtkgui_helpers.py:507
 #, fuzzy
 msgid "Save Image as…"
 msgstr "圖片另存為…"
 
-#: gajim/vcard.py:169 gajim/vcard.py:513 gajim/profile_window.py:177
-#: gajim/chat_control.py:553
+#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "儲存在: %s"
 
-#: gajim/vcard.py:385
+#: gajim/vcard.py:286 gajim/vcard.py:293
+msgid "?Client:Unknown"
+msgstr "不明"
+
+#: gajim/vcard.py:290 gajim/vcard.py:295
+msgid "?OS:Unknown"
+msgstr "不明"
+
+#: gajim/vcard.py:324 gajim/vcard.py:327
+msgid "?Time:Unknown"
+msgstr "不明"
+
+#: gajim/vcard.py:378
+msgid "?Role in Group Chat:<b>Role:</b>"
+msgstr "?Role in Group Chat:<b>角色</b>"
+
+#: gajim/vcard.py:382
 msgid "<b>Affiliation:</b>"
 msgstr "<b>歸屬:</b>"
 
-#: gajim/vcard.py:392
+#: gajim/vcard.py:389
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr "此聯絡人對您的狀態資訊感興趣，但您不關心他/她的狀態"
 
-#: gajim/vcard.py:394
+#: gajim/vcard.py:391
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr "您對此聯絡人的狀態資訊感興趣，但他/她不關心您的狀態"
 
-#: gajim/vcard.py:396
+#: gajim/vcard.py:393
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "您與此聯絡人同時對對方的狀態資訊感興趣"
 
-#: gajim/vcard.py:398
+#: gajim/vcard.py:395
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "您與此聯絡人同時對對方的狀態資訊感興趣"
 
-#: gajim/vcard.py:404
+#: gajim/vcard.py:401
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待聯絡人回應您的認證請求"
 
-#: gajim/vcard.py:406
+#: gajim/vcard.py:403
 msgid "There is no pending subscription request."
 msgstr "沒有未處理的認證請求"
 
-#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
+#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
 msgid " resource with priority "
 msgstr "帶有優先等級的資源"
 
-#: gajim/options_dialog.py:383 gajim/dialogs.py:4764 gajim/dialogs.py:4806
-#: gajim/dialogs.py:4854 gajim/dialogs.py:4944
+#: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
+#: gajim/dialogs.py:4857 gajim/dialogs.py:4947
 msgid "All files"
 msgstr "所有檔案"
 
+#: gajim/options_dialog.py:392
+#, fuzzy
+msgid "Clear File"
+msgstr "清潔"
+
+#: gajim/options_dialog.py:474
+#, fuzzy
+msgid "Manage Proxies"
+msgstr "管理代理伺服器設定"
+
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
-#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2984
-#: gajim/roster_window.py:2990 gajim/roster_window.py:2995 gajim/config.py:1172
+#: gajim/dialogs.py:539 gajim/dialogs.py:552 gajim/roster_window.py:2997
+#: gajim/roster_window.py:3003 gajim/roster_window.py:3008 gajim/config.py:1172
 #: gajim/config.py:1187 gajim/config.py:1192 gajim/config.py:1240
 #: gajim/config.py:1350 gajim/config.py:2493 gajim/config.py:2570
 #: gajim/data/gui/account_creation_wizard_window.ui:22
@@ -571,13 +601,13 @@ msgid "_New Group Chat"
 msgstr "新聊天室(_N)"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
-#: gajim/dialogs.py:1122 gajim/dialogs.py:2314 gajim/dialogs.py:2343
-#: gajim/dialogs.py:3825 gajim/chat_control.py:279 gajim/roster_window.py:789
-#: gajim/roster_window.py:1741 gajim/roster_window.py:1743
-#: gajim/roster_window.py:2056 gajim/roster_window.py:3408
-#: gajim/roster_window.py:3435 gajim/gui_interface.py:525
-#: gajim/common/contacts.py:156 gajim/common/contacts.py:282
-#: gajim/common/helpers.py:94 gajim/common/helpers.py:407
+#: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
+#: gajim/dialogs.py:3828 gajim/chat_control.py:281 gajim/roster_window.py:804
+#: gajim/roster_window.py:1753 gajim/roster_window.py:1755
+#: gajim/roster_window.py:2068 gajim/roster_window.py:3419
+#: gajim/roster_window.py:3446 gajim/gui_interface.py:524
+#: gajim/common/contacts.py:154 gajim/common/contacts.py:280
+#: gajim/common/helpers.py:95 gajim/common/helpers.py:408
 msgid "Not in Roster"
 msgstr "不在聯絡人清單中"
 
@@ -590,7 +620,7 @@ msgstr "我希望將您加入到我的聯絡人清單"
 msgid "Send Single _Message…"
 msgstr "傳送單條訊息(_M)"
 
-#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5160
+#: gajim/gui_menu_builder.py:521 gajim/roster_window.py:5168
 #: gajim/data/gui/contact_context_menu.ui:58
 msgid "Send Cus_tom Status"
 msgstr "傳送個性化狀態(_T)"
@@ -608,25 +638,25 @@ msgstr "管理代理(_M)"
 msgid "_Modify Transport"
 msgstr "修改代理(_M)"
 
-#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5190
+#: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
 #, fuzzy
 msgid "_Rename…"
 msgstr "重新命名(_R)"
 
-#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5207
-#: gajim/roster_window.py:5322 gajim/data/gui/blocked_contacts_window.ui:52
-#: gajim/data/gui/gc_occupants_menu.ui:140
+#: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
+#: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/data/gui/gc_occupants_menu.ui:148
 #: gajim/data/gui/contact_context_menu.ui:166
 msgid "_Unblock"
 msgstr "解除阻斷(_U)"
 
-#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5212
-#: gajim/roster_window.py:5326 gajim/data/gui/gc_occupants_menu.ui:132
+#: gajim/gui_menu_builder.py:576 gajim/roster_window.py:5220
+#: gajim/roster_window.py:5334 gajim/data/gui/gc_occupants_menu.ui:140
 #: gajim/data/gui/contact_context_menu.ui:174
 msgid "_Block"
 msgstr "阻斷(_B)"
 
-#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5219
+#: gajim/gui_menu_builder.py:584 gajim/roster_window.py:5227
 #: gajim/data/gui/contact_context_menu.ui:204
 msgid "Remo_ve"
 msgstr "移除(_R)"
@@ -640,211 +670,231 @@ msgstr "資訊(_I)"
 msgid "Send File..."
 msgstr "傳送檔案(_F)…"
 
-#: gajim/gui_menu_builder.py:612
+#: gajim/gui_menu_builder.py:615
 #, fuzzy
 msgid "Invite Contacts"
 msgstr "邀請聯絡人(_C)"
 
-#: gajim/gui_menu_builder.py:613
+#: gajim/gui_menu_builder.py:616
 #, fuzzy
 msgid "Add to Roster"
 msgstr "加入至聯絡人清單(_A)"
 
-#: gajim/gui_menu_builder.py:614
+#: gajim/gui_menu_builder.py:617
 #, fuzzy
 msgid "Audio Session"
 msgstr "音訊測試"
 
-#: gajim/gui_menu_builder.py:615
+#: gajim/gui_menu_builder.py:618
 #, fuzzy
 msgid "Video Session"
 msgstr "視訊測試"
 
-#: gajim/gui_menu_builder.py:616
+#: gajim/gui_menu_builder.py:619
 #, fuzzy
 msgid "Information"
 msgstr "資訊(_I)"
 
-#: gajim/gui_menu_builder.py:617 gajim/gui_menu_builder.py:645
+#: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
 #, fuzzy
 msgid "History"
 msgstr "命令歷程(_H)"
 
-#: gajim/gui_menu_builder.py:635
+#: gajim/gui_menu_builder.py:644
 #, fuzzy
 msgid "Manage Room"
 msgstr "管理聊天室(_M)"
 
-#: gajim/gui_menu_builder.py:636
+#: gajim/gui_menu_builder.py:645
 #, fuzzy
 msgid "Change Subject"
 msgstr "變更主題(_S)…"
 
-#: gajim/gui_menu_builder.py:637
+#: gajim/gui_menu_builder.py:646
 #, fuzzy
 msgid "Configure Room"
 msgstr "設定聊天室(_R)…"
 
-#: gajim/gui_menu_builder.py:638
+#: gajim/gui_menu_builder.py:647
 #, fuzzy
 msgid "Destroy Room"
 msgstr "刪除聊天室(_D)"
 
-#: gajim/gui_menu_builder.py:640
+#: gajim/gui_menu_builder.py:649
 #, fuzzy
 msgid "Change Nick"
 msgstr "變更暱稱(_N)…"
 
-#: gajim/gui_menu_builder.py:641
+#: gajim/gui_menu_builder.py:650
 #, fuzzy
 msgid "Bookmark Room"
 msgstr "將本聊天室加入書籤(_B)"
 
-#: gajim/gui_menu_builder.py:642
+#: gajim/gui_menu_builder.py:651
 #, fuzzy
 msgid "Request Voice"
 msgstr "要求語音(_R)"
 
-#: gajim/gui_menu_builder.py:643 gajim/data/gui/gc_control_popup_menu.ui:72
+#: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
 #, fuzzy
 msgid "Notify on all messages"
 msgstr "預設的訊息:"
 
-#: gajim/gui_menu_builder.py:644
+#: gajim/gui_menu_builder.py:653
 #, fuzzy
 msgid "Minimize on close"
 msgstr "關閉時最小化視窗"
 
-#: gajim/gui_menu_builder.py:646
+#: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
+#, fuzzy
+msgid "Execute command"
+msgstr "執行命令(_E)…"
+
+#: gajim/gui_menu_builder.py:656
 #, fuzzy
 msgid "Disconnect"
 msgstr "中斷連線(_D)"
 
-#: gajim/gui_menu_builder.py:675 gajim/gui_menu_builder.py:722
+#: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
 msgstr "加入多人聊天"
 
-#: gajim/gui_menu_builder.py:721
+#: gajim/gui_menu_builder.py:731
 #, fuzzy
 msgid "Add Contact..."
 msgstr "加入聯絡人(_A)…"
 
-#: gajim/gui_menu_builder.py:723 gajim/accounts_window.py:459
+#: gajim/gui_menu_builder.py:733 gajim/accounts_window.py:459
 #: gajim/accounts_window.py:554 gajim/accounts_window.py:593
 #, fuzzy
 msgid "Profile"
 msgstr "檔案"
 
-#: gajim/gui_menu_builder.py:724
+#: gajim/gui_menu_builder.py:734
 #, fuzzy
 msgid "Discover Services"
 msgstr "探索服務(_D)"
 
-#: gajim/gui_menu_builder.py:725
+#: gajim/gui_menu_builder.py:735
 #, fuzzy
 msgid "Send Single Message..."
 msgstr "傳送單條訊息(_M)…"
 
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:736 gajim/data/gui/preferences_window.ui:2846
+msgid "Advanced"
+msgstr "進階"
+
+#: gajim/gui_menu_builder.py:737
 #, fuzzy
 msgid "Archiving Preferences"
 msgstr "編輯存檔偏好設定(_V)"
 
-#: gajim/gui_menu_builder.py:728 gajim/history_sync.py:44
+#: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
 #, fuzzy
 msgid "Synchronise History"
 msgstr "同步"
 
-#: gajim/gui_menu_builder.py:729 gajim/dialogs.py:4541
+#: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
 msgstr "隱私策略清單"
 
-#: gajim/gui_menu_builder.py:730 gajim/server_info.py:37
+#: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
 #, fuzzy
 msgid "Server Info"
 msgstr "伺服器"
 
-#: gajim/gui_menu_builder.py:731
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
 msgstr " XML 主控臺"
 
-#: gajim/gui_menu_builder.py:734
+#: gajim/gui_menu_builder.py:743
+#, fuzzy
+msgid "Admin"
+msgstr "管理(_A)"
+
+#: gajim/gui_menu_builder.py:744
 #, fuzzy
 msgid "Send Server Message..."
 msgstr "傳送伺服器訊息(_S)…"
 
-#: gajim/gui_menu_builder.py:735
+#: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
 msgstr "設定 MOTD…"
 
-#: gajim/gui_menu_builder.py:736
+#: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
 msgstr "更新 MOTD…"
 
-#: gajim/gui_menu_builder.py:737
+#: gajim/gui_menu_builder.py:747
 #, fuzzy
 msgid "Delete MOTD..."
 msgstr "刪除 MOTD"
 
-#: gajim/gui_menu_builder.py:777
+#: gajim/gui_menu_builder.py:787
 #, fuzzy
 msgid "No Accounts available"
 msgstr "沒有有效帳號"
 
-#: gajim/history_manager.py:57
+#: gajim/gui_menu_builder.py:799 gajim/data/gui/accounts_window.ui:78
+#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
+#: gajim/data/gui/shortcuts_window.ui:181
+msgid "Accounts"
+msgstr "帳號"
+
+#: gajim/history_manager.py:56
 #, fuzzy
 msgid "Usage:"
 msgstr "message"
 
-#: gajim/history_manager.py:59
+#: gajim/history_manager.py:58
 #, fuzzy
 msgid "Options:"
 msgstr "表情(_E):"
 
-#: gajim/history_manager.py:61
+#: gajim/history_manager.py:60
 msgid "Show this help message and exit"
 msgstr ""
 
-#: gajim/history_manager.py:62
+#: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
 msgstr ""
 
-#: gajim/history_manager.py:105
+#: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
 msgstr "無法找到命令歷程記錄資料庫"
 
-#: gajim/history_manager.py:145 gajim/history_manager.py:196
-#: gajim/dialogs.py:3806 gajim/config.py:1631 gajim/disco.py:872
+#: gajim/history_manager.py:144 gajim/history_manager.py:195
+#: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
 msgid "JID"
 msgstr "JID"
 
-#: gajim/history_manager.py:158 gajim/history_manager.py:202
+#: gajim/history_manager.py:157 gajim/history_manager.py:201
 #: gajim/history_window.py:104
 msgid "Date"
 msgstr "日期"
 
-#: gajim/history_manager.py:165 gajim/history_manager.py:221
+#: gajim/history_manager.py:164 gajim/history_manager.py:220
 #: gajim/data/gui/join_groupchat_window.ui:131
 msgid "Nickname"
 msgstr "暱稱"
 
-#: gajim/history_manager.py:174 gajim/history_manager.py:209
+#: gajim/history_manager.py:173 gajim/history_manager.py:208
 #: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "訊息"
 
-#: gajim/history_manager.py:182 gajim/history_manager.py:215
+#: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
 msgstr "主題"
 
-#: gajim/history_manager.py:241
+#: gajim/history_manager.py:240
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您確定要清除資料庫?(強烈建議 GAJIM 執行時不要進行此作業)"
 
-#: gajim/history_manager.py:243
+#: gajim/history_manager.py:242
 #, fuzzy
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
@@ -858,94 +908,94 @@ msgstr ""
 "\n"
 "如果您點擊\"是\"，請等待…"
 
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:247
 msgid "Database Cleanup"
 msgstr "資料庫清理"
 
-#: gajim/history_manager.py:463
+#: gajim/history_manager.py:462
 #, fuzzy
 msgid "Exporting History Logs…"
 msgstr "輸出命令歷程記錄…"
 
-#: gajim/history_manager.py:539
+#: gajim/history_manager.py:538
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 時說:  %(message)s\n"
 
-#: gajim/history_manager.py:577
+#: gajim/history_manager.py:576
 #, fuzzy, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
 msgstr "您真的要刪除 %(jid)s 的記錄檔嗎？"
 
-#: gajim/history_manager.py:581
+#: gajim/history_manager.py:580
 #, fuzzy
 msgid "Do you wish to delete all correspondence with the selected contacts?"
 msgstr "您真的要刪除已選聯絡人的記錄檔嗎？"
 
-#: gajim/history_manager.py:583
+#: gajim/history_manager.py:582
 #, fuzzy
 msgid "This can not be undone."
 msgstr "找不到該服務"
 
-#: gajim/history_manager.py:585 gajim/history_manager.py:624
+#: gajim/history_manager.py:584 gajim/history_manager.py:623
 msgid "Deletion Confirmation"
 msgstr "刪除確認"
 
-#: gajim/history_manager.py:619
+#: gajim/history_manager.py:618
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您確定要刪除所選取的訊息?"
 
-#: gajim/history_manager.py:622
+#: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
 msgstr "該作業是不可撤消的。"
 
-#: gajim/profile_window.py:66
+#: gajim/profile_window.py:63
 #, fuzzy
 msgid "Retrieving profile…"
 msgstr "正在獲取側寫…"
 
-#: gajim/profile_window.py:131
+#: gajim/profile_window.py:128
 msgid "Could not load image"
 msgstr "無法讀取圖片"
 
-#: gajim/profile_window.py:202
+#: gajim/profile_window.py:200
 msgid "Wrong date format"
 msgstr "錯誤的資料格式"
 
-#: gajim/profile_window.py:203
+#: gajim/profile_window.py:201
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "日期的格式必須是 YYYY-MM-DD"
 
-#: gajim/profile_window.py:263
+#: gajim/profile_window.py:261
 msgid "Information received"
 msgstr "資訊已收到"
 
-#: gajim/profile_window.py:336 gajim/dialogs.py:2537 gajim/dialogs.py:2625
-#: gajim/dialogs.py:3080 gajim/disco.py:536 gajim/gui_interface.py:1800
+#: gajim/profile_window.py:334 gajim/dialogs.py:2531 gajim/dialogs.py:2619
+#: gajim/dialogs.py:3075 gajim/disco.py:536 gajim/gui_interface.py:1841
 #: gajim/dialog_messages.py:32
 msgid "You are not connected to the server"
 msgstr "尚未連線到伺服器"
 
-#: gajim/profile_window.py:337
+#: gajim/profile_window.py:335
 #, fuzzy
 msgid "Without a connection, you can not publish your contact information."
 msgstr "沒有連線的情況下您無法發布您的聯絡人資訊。"
 
-#: gajim/profile_window.py:351
+#: gajim/profile_window.py:349
 #, fuzzy
 msgid "Sending profile…"
 msgstr "傳送側寫…"
 
-#: gajim/profile_window.py:370
+#: gajim/profile_window.py:368
 msgid "Information NOT published"
 msgstr "資訊沒有發布"
 
-#: gajim/profile_window.py:377
+#: gajim/profile_window.py:375
 msgid "vCard publication failed"
 msgstr "vCard 發布失敗"
 
-#: gajim/profile_window.py:378
+#: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -961,10 +1011,10 @@ msgstr "聯絡人名稱: <i>%s</i>"
 msgid "JID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2926
-#: gajim/roster_window.py:3942 gajim/roster_window.py:5229
-#: gajim/accounts_window.py:462 gajim/common/contacts.py:107
-#: gajim/common/contacts.py:139 gajim/data/gui/preferences_window.ui:569
+#: gajim/dialogs.py:126 gajim/dialogs.py:138 gajim/roster_window.py:2939
+#: gajim/roster_window.py:3953 gajim/roster_window.py:5237
+#: gajim/accounts_window.py:462 gajim/common/contacts.py:105
+#: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
 msgstr "一般"
@@ -1050,36 +1100,36 @@ msgstr "請填入您想加入到帳號 %s 的聯絡人的資訊"
 msgid "Please fill in the data of the contact you want to add"
 msgstr "請填入您想加入的聯絡人的資訊"
 
-#: gajim/dialogs.py:1097 gajim/dialogs.py:1103 gajim/dialogs.py:1108
+#: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
 msgstr "無效的使用者ID"
 
-#: gajim/dialogs.py:1104
+#: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
 msgstr "使用者ID不應包含資源。"
 
-#: gajim/dialogs.py:1109
+#: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
 msgstr "您不能將您自己加入到您的聯絡人清單中。"
 
-#: gajim/dialogs.py:1123
+#: gajim/dialogs.py:1118
 msgid "Contact already in roster"
 msgstr "聯絡人已經在聯絡人清單中"
 
-#: gajim/dialogs.py:1124
+#: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
 msgstr "此聯絡人已經在您的聯絡人清單中了"
 
-#: gajim/dialogs.py:1177 gajim/dialogs.py:1211
+#: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
 msgstr "使用者 ID:"
 
-#: gajim/dialogs.py:1277
+#: gajim/dialogs.py:1272
 #, fuzzy
 msgid "Error while adding transport contact"
 msgstr "加入服務錯誤。 %s"
 
-#: gajim/dialogs.py:1278
+#: gajim/dialogs.py:1273
 #, python-format
 msgid ""
 "This error occured while adding a contact for transport %(transport)s:\n"
@@ -1087,50 +1137,50 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: gajim/dialogs.py:1310
+#: gajim/dialogs.py:1305
 #, fuzzy
 msgid "A GTK+ XMPP client"
 msgstr "一個 GTK+ 的 Jabber 客戶端"
 
-#: gajim/dialogs.py:1311
+#: gajim/dialogs.py:1306
 #, fuzzy, python-format
 msgid "GTK+ Version: %s"
 msgstr "GTK+ 版本:"
 
-#: gajim/dialogs.py:1312
+#: gajim/dialogs.py:1307
 #, fuzzy, python-format
 msgid "PyGObject Version: %s"
 msgstr "PyGTK 版本:"
 
-#: gajim/dialogs.py:1313
+#: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
 msgstr ""
 
-#: gajim/dialogs.py:1316
+#: gajim/dialogs.py:1311
 #, fuzzy
 msgid "Current Developers"
 msgstr "目前的開發者:"
 
-#: gajim/dialogs.py:1317
+#: gajim/dialogs.py:1312
 #, fuzzy
 msgid "Past Developers"
 msgstr "既往開發者:"
 
-#: gajim/dialogs.py:1318
+#: gajim/dialogs.py:1313
 msgid "Artists"
 msgstr ""
 
-#: gajim/dialogs.py:1322
+#: gajim/dialogs.py:1317
 msgid "Last but not least"
 msgstr ""
 
-#: gajim/dialogs.py:1323
+#: gajim/dialogs.py:1318
 #, fuzzy
 msgid "we would like to thank all the package maintainers."
 msgstr "最後但不是最不重要的，我們要感謝所有的套件維護者。"
 
-#: gajim/dialogs.py:1326
+#: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
@@ -1139,12 +1189,12 @@ msgstr ""
 "Guanhao Yin <yinguanhao@gmail.com>\n"
 "趙惟倫 <chaoweilun@gmail.com>"
 
-#: gajim/dialogs.py:1490
+#: gajim/dialogs.py:1485
 #, fuzzy, python-format
-msgid "Dictionary for lang \"%s\" not available"
+msgid "Dictionary for language \"%s\" not available"
 msgstr "語言 %s 的詞典無法使用"
 
-#: gajim/dialogs.py:1491
+#: gajim/dialogs.py:1486
 #, fuzzy, python-format
 msgid ""
 "You have to install the dictionary \"%s\" to use spellchecking, or choose "
@@ -1156,12 +1206,12 @@ msgstr ""
 "言。\n"
 "高亮度拼寫錯誤的特性不會被啟用。"
 
-#: gajim/dialogs.py:1838 gajim/dialogs.py:1853 gajim/gui_interface.py:1467
-#: gajim/gui_interface.py:1509
+#: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
+#: gajim/gui_interface.py:1550
 msgid "Insecure connection"
 msgstr "不安全的連線"
 
-#: gajim/dialogs.py:1839
+#: gajim/dialogs.py:1834
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) insecurely. "
@@ -1172,488 +1222,512 @@ msgstr ""
 "您即將透過不安全的連線與帳號 %(account)s (%(server)s) 連接。這意味著您的所有"
 "對話都會不經加密地被交換。您確定要這樣做嗎？"
 
-#: gajim/dialogs.py:1844 gajim/gui_interface.py:1471
-#: gajim/gui_interface.py:1512
+#: gajim/dialogs.py:1839 gajim/gui_interface.py:1512
+#: gajim/gui_interface.py:1553
 msgid "Yes, I really want to connect insecurely"
 msgstr "是的，我確實想要不安全地連線"
 
-#: gajim/dialogs.py:1845
+#: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: gajim/dialogs.py:1846 gajim/groupchat_control.py:2242
-#: gajim/roster_window.py:2884 gajim/roster_window.py:3518
-#: gajim/roster_window.py:4271 gajim/message_window.py:254
-#: gajim/gui_interface.py:726 gajim/gui_interface.py:1472
-#: gajim/gui_interface.py:1513
+#: gajim/dialogs.py:1841 gajim/groupchat_control.py:2284
+#: gajim/roster_window.py:2897 gajim/roster_window.py:3529
+#: gajim/roster_window.py:4282 gajim/message_window.py:247
+#: gajim/gui_interface.py:725 gajim/gui_interface.py:1513
+#: gajim/gui_interface.py:1554
 msgid "_Do not ask me again"
 msgstr "不要再問我了(_D)"
 
-#: gajim/dialogs.py:1946
+#: gajim/dialogs.py:1941
 msgid "_Resume"
 msgstr "再續(_R)"
 
-#: gajim/dialogs.py:1954
+#: gajim/dialogs.py:1949
 msgid "Re_place"
 msgstr "置換(_P)"
 
-#: gajim/dialogs.py:2157 gajim/config.py:2174
+#: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
 msgid "Invalid nickname"
 msgstr "無效的暱稱"
 
-#: gajim/dialogs.py:2158
+#: gajim/dialogs.py:2153
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "暱稱包含不合法字元。"
 
-#: gajim/dialogs.py:2281
+#: gajim/dialogs.py:2275
+msgid "Subscription Request"
+msgstr "認證請求"
+
+#: gajim/dialogs.py:2284
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(jid)s 對帳號 %(account)s 的認證請求"
 
-#: gajim/dialogs.py:2284
+#: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s 的認證請求"
 
-#: gajim/dialogs.py:2364
+#: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
 #, fuzzy
 msgid "Join Groupchat"
 msgstr "加入多人聊天"
 
-#: gajim/dialogs.py:2506
+#: gajim/dialogs.py:2500
 #, fuzzy
 msgid "Invalid Room"
 msgstr "無效聊天室"
 
-#: gajim/dialogs.py:2507
+#: gajim/dialogs.py:2501
 msgid "Please choose a room"
 msgstr ""
 
-#: gajim/dialogs.py:2519 gajim/dialogs.py:2526
+#: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
 msgstr "不合法的暱稱"
 
-#: gajim/dialogs.py:2520
+#: gajim/dialogs.py:2514
 #, fuzzy
 msgid "Please choose a nickname"
 msgstr "請用您想要的名稱新增一個主題。"
 
-#: gajim/dialogs.py:2532 gajim/dialogs.py:3483 gajim/config.py:2457
+#: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
 msgid "Invalid JID"
 msgstr "無效的 JID"
 
-#: gajim/dialogs.py:2538 gajim/gui_interface.py:1801
+#: gajim/dialogs.py:2532 gajim/gui_interface.py:1842
 msgid "You can not join a group chat unless you are connected."
 msgstr "您必須連線才能加入聊天室。"
 
-#: gajim/dialogs.py:2592 gajim/dialogs.py:2603
+#: gajim/dialogs.py:2586 gajim/dialogs.py:2597
 #, fuzzy
 msgid "Wrong server"
 msgstr "錯誤的 uri"
 
-#: gajim/dialogs.py:2593 gajim/dialogs.py:2604
+#: gajim/dialogs.py:2587 gajim/dialogs.py:2598
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "這不是一個聊天室"
 
-#: gajim/dialogs.py:2626
+#: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未連線時，您不能同步您的聯絡人。"
 
-#: gajim/dialogs.py:2637 gajim/dialogs.py:2708 gajim/dialogs.py:3809
+#: gajim/dialogs.py:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
 #: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "名稱"
 
-#: gajim/dialogs.py:2640 gajim/data/gui/join_groupchat_window.ui:214
+#: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
 msgstr "伺服器"
 
-#: gajim/dialogs.py:2676
+#: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
 msgstr "這個帳號已經連線到伺服器"
 
-#: gajim/dialogs.py:2677
+#: gajim/dialogs.py:2671
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "這個帳號連線後您才可以與之同步"
 
-#: gajim/dialogs.py:2706
+#: gajim/dialogs.py:2700
 msgid "Synchronise"
 msgstr "同步"
 
-#: gajim/dialogs.py:2778
+#: gajim/dialogs.py:2772
 #, fuzzy
 msgid "Start new Conversation"
 msgstr "繼續對話"
 
-#: gajim/dialogs.py:3033
+#: gajim/dialogs.py:3028
 #, fuzzy
 msgid "New Groupchat"
 msgstr "新聊天室"
 
-#: gajim/dialogs.py:3035
+#: gajim/dialogs.py:3030
 #, fuzzy
 msgid "New Contact"
 msgstr "加入聯絡人"
 
-#: gajim/dialogs.py:3081
+#: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
 msgstr "連線後才可變更密碼。"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "Invalid password"
 msgstr "無效密碼"
 
-#: gajim/dialogs.py:3101
+#: gajim/dialogs.py:3096
 msgid "You must enter a password."
 msgstr "您必須輸入密碼"
 
-#: gajim/dialogs.py:3105
+#: gajim/dialogs.py:3100
 msgid "Passwords do not match"
 msgstr "密碼不符"
 
-#: gajim/dialogs.py:3106
+#: gajim/dialogs.py:3101
 msgid "The passwords typed in both fields must be identical."
 msgstr "在兩個輸入框中輸入的密碼必須一致。"
 
-#: gajim/dialogs.py:3146 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2770
+#: gajim/dialogs.py:3139 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2789
 msgid "Contact Signed In"
 msgstr "聯絡人登入"
 
-#: gajim/dialogs.py:3148 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2776
+#: gajim/dialogs.py:3141 gajim/notify.py:91
+#: gajim/common/connection_handlers_events.py:2795
 msgid "Contact Signed Out"
 msgstr "聯絡人離開登入"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2590
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2609
 msgid "New Message"
 msgstr "新訊息"
 
-#: gajim/dialogs.py:3150 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2572
+#: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
+#: gajim/common/connection_handlers_events.py:2591
 msgid "New Single Message"
 msgstr "新單條訊息"
 
-#: gajim/dialogs.py:3151 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2578
+#: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
+#: gajim/common/connection_handlers_events.py:2597
 msgid "New Private Message"
 msgstr "新個人訊息"
 
-#: gajim/dialogs.py:3151
+#: gajim/dialogs.py:3144
 msgid "New E-mail"
 msgstr "新電子郵件"
 
-#: gajim/dialogs.py:3153 gajim/gui_interface.py:927 gajim/notify.py:93
+#: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
 msgstr "檔案傳輸請求"
 
-#: gajim/dialogs.py:3155 gajim/gui_interface.py:862 gajim/gui_interface.py:892
+#: gajim/dialogs.py:3148 gajim/gui_interface.py:861 gajim/gui_interface.py:891
 #: gajim/notify.py:94
 msgid "File Transfer Error"
 msgstr "檔案傳輸錯誤"
 
-#: gajim/dialogs.py:3157 gajim/gui_interface.py:1031
-#: gajim/gui_interface.py:1060 gajim/gui_interface.py:1081 gajim/notify.py:94
+#: gajim/dialogs.py:3150 gajim/gui_interface.py:1030
+#: gajim/gui_interface.py:1059 gajim/gui_interface.py:1080 gajim/notify.py:94
 msgid "File Transfer Completed"
 msgstr "檔案傳輸完成"
 
-#: gajim/dialogs.py:3158 gajim/gui_interface.py:1035
-#: gajim/gui_interface.py:1064 gajim/gui_interface.py:1085 gajim/notify.py:95
+#: gajim/dialogs.py:3151 gajim/gui_interface.py:1034
+#: gajim/gui_interface.py:1063 gajim/gui_interface.py:1084 gajim/notify.py:95
 msgid "File Transfer Stopped"
 msgstr "檔案傳輸已停止"
 
-#: gajim/dialogs.py:3160 gajim/dialogs.py:4706 gajim/chat_control.py:1627
-#: gajim/gui_interface.py:664 gajim/notify.py:95
+#: gajim/dialogs.py:3153 gajim/dialogs.py:4709 gajim/chat_control.py:1630
+#: gajim/gui_interface.py:663 gajim/notify.py:95
 msgid "Groupchat Invitation"
 msgstr "多人聊天邀請"
 
-#: gajim/dialogs.py:3162 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2764
+#: gajim/dialogs.py:3155 gajim/notify.py:93
+#: gajim/common/connection_handlers_events.py:2783
 msgid "Contact Changed Status"
 msgstr "聯絡人狀態變更"
 
-#: gajim/dialogs.py:3371
+#: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
 msgstr "單條訊息，使用帳號 %s"
 
-#: gajim/dialogs.py:3373
+#: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
 msgstr "單條訊息，在帳號 %s"
 
-#: gajim/dialogs.py:3375
+#: gajim/dialogs.py:3378
 msgid "Single Message"
 msgstr "單條訊息"
 
-#: gajim/dialogs.py:3378
+#: gajim/dialogs.py:3381
 #, python-format
 msgid "Send %s"
 msgstr "傳送 %s"
 
-#: gajim/dialogs.py:3401
+#: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
-#: gajim/dialogs.py:3424
+#: gajim/dialogs.py:3427
 #, python-format
 msgid "Form %s"
 msgstr "來自 %s"
 
-#: gajim/dialogs.py:3452 gajim/dialogs.py:3638
+#: gajim/dialogs.py:3455 gajim/dialogs.py:3641
 msgid "Connection not available"
 msgstr "連線無法使用"
 
-#: gajim/dialogs.py:3453 gajim/dialogs.py:3639
+#: gajim/dialogs.py:3456 gajim/dialogs.py:3642
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "請確認您已經連線到 \"%s\"。"
 
-#: gajim/dialogs.py:3484 gajim/dialog_messages.py:43
+#: gajim/dialogs.py:3487 gajim/dialog_messages.py:43
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "不能向 %s 傳送訊息，無效的 JID。"
 
-#: gajim/dialogs.py:3507
+#: gajim/dialogs.py:3510
 #, python-format
 msgid "RE: %s"
 msgstr "回復: %s"
 
-#: gajim/dialogs.py:3508
+#: gajim/dialogs.py:3511
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 寫道: \n"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
+#, fuzzy
+msgid "Clear"
+msgstr "清潔"
+
+#: gajim/dialogs.py:3563
+#, fuzzy
+msgid "Filter"
+msgstr "過濾器:"
+
+#: gajim/dialogs.py:3568
+#, fuzzy
+msgid "XML Input"
+msgstr "<b>XML 輸入</b>"
+
+#: gajim/dialogs.py:3572
+#, fuzzy
+msgid "Send"
+msgstr "傳送(_S)"
+
+#: gajim/dialogs.py:3755
 msgid "add"
 msgstr "加入"
 
-#: gajim/dialogs.py:3752
+#: gajim/dialogs.py:3755
 msgid "modify"
 msgstr "修改"
 
-#: gajim/dialogs.py:3753
+#: gajim/dialogs.py:3756
 msgid "remove"
 msgstr "移除"
 
-#: gajim/dialogs.py:3782
+#: gajim/dialogs.py:3785
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
 msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些聯絡人。"
 
-#: gajim/dialogs.py:3798 gajim/dialogs.py:3844
+#: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
 msgstr "加入"
 
-#: gajim/dialogs.py:3800 gajim/dialogs.py:3875
+#: gajim/dialogs.py:3803 gajim/dialogs.py:3878
 msgid "Modify"
 msgstr "修改"
 
-#: gajim/dialogs.py:3802 gajim/dialogs.py:3899
+#: gajim/dialogs.py:3805 gajim/dialogs.py:3902
 msgid "Delete"
 msgstr "刪除"
 
-#: gajim/dialogs.py:3812
+#: gajim/dialogs.py:3815
 msgid "Groups"
 msgstr "群組"
 
-#: gajim/dialogs.py:3920
+#: gajim/dialogs.py:3923
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s 建議我將您加入到我的聯絡人清單。"
 
-#: gajim/dialogs.py:3934
+#: gajim/dialogs.py:3937
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "加入了 %s 聯絡人"
 
-#: gajim/dialogs.py:3972
+#: gajim/dialogs.py:3975
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "移除了 %s 聯絡人"
 
-#: gajim/dialogs.py:3998
+#: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s 的存檔偏好設定"
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 msgid "Success!"
 msgstr ""
 
-#: gajim/dialogs.py:4036
+#: gajim/dialogs.py:4039
 #, fuzzy
 msgid "Your Archiving Preferences have been saved!"
 msgstr "%s 的存檔偏好設定"
 
-#: gajim/dialogs.py:4052
+#: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
 msgstr ""
 
-#: gajim/dialogs.py:4054
+#: gajim/dialogs.py:4057
 #, fuzzy
 msgid "We received an error: {}"
 msgstr "有一處錯誤"
 
-#: gajim/dialogs.py:4058
+#: gajim/dialogs.py:4061
 #, fuzzy
 msgid "Error!"
 msgstr "錯誤"
 
-#: gajim/dialogs.py:4117
+#: gajim/dialogs.py:4120
 #, fuzzy
 msgid "Add JID"
 msgstr "Jabber ID"
 
-#: gajim/dialogs.py:4190
+#: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "隱私策略清單 <b><i>%s</i></b>"
 
-#: gajim/dialogs.py:4194
+#: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的隱私策略清單"
 
-#: gajim/dialogs.py:4196 gajim/data/gui/privacy_list_window.ui:47
+#: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
 msgstr "隱私策略清單"
 
-#: gajim/dialogs.py:4267
+#: gajim/dialogs.py:4270
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "順序: %(order)s，動作: %(action)s，類型: %(type)s，值: %(value)s"
 
-#: gajim/dialogs.py:4272
+#: gajim/dialogs.py:4275
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "順序: %(order)s，動作: %(action)s"
 
-#: gajim/dialogs.py:4326
+#: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
 msgstr "<b>編輯規則</b>"
 
-#: gajim/dialogs.py:4438
+#: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
 msgstr "<b>加入規則</b>"
 
-#: gajim/dialogs.py:4539
+#: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的隱私策略清單"
 
-#: gajim/dialogs.py:4635
+#: gajim/dialogs.py:4638
 msgid "Invalid List Name"
 msgstr "不合法的清單名稱"
 
-#: gajim/dialogs.py:4636
+#: gajim/dialogs.py:4639
 msgid "You must enter a name to create a privacy list."
 msgstr "您必須輸入一個名稱以建立一個隱私策略清單。"
 
-#: gajim/dialogs.py:4672
+#: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
 msgstr "您被邀請到一個聊天室"
 
-#: gajim/dialogs.py:4675
+#: gajim/dialogs.py:4678
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact 邀請您加入一個聊天室"
 
-#: gajim/dialogs.py:4677
+#: gajim/dialogs.py:4680
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact 邀請您參加聊天室 %(room_jid)s"
 
-#: gajim/dialogs.py:4686
+#: gajim/dialogs.py:4689
 #, python-format
 msgid "Comment: %s"
 msgstr "註釋: %s"
 
-#: gajim/dialogs.py:4688
+#: gajim/dialogs.py:4691
 msgid "Do you want to accept the invitation?"
 msgstr "您是否接受邀請?"
 
-#: gajim/dialogs.py:4704
+#: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: gajim/dialogs.py:4753
+#: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
 msgstr "選擇客戶端證書 #PCKS12"
 
-#: gajim/dialogs.py:4769 gajim/accounts_window.py:656
+#: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
 msgstr "PKCS12 檔案"
 
-#: gajim/dialogs.py:4795
+#: gajim/dialogs.py:4798
 msgid "Choose Sound"
 msgstr "選擇聲音"
 
-#: gajim/dialogs.py:4811
+#: gajim/dialogs.py:4814
 msgid "Wav Sounds"
 msgstr "Wav聲音"
 
-#: gajim/dialogs.py:4841
+#: gajim/dialogs.py:4844
 msgid "Choose Image"
 msgstr "選擇圖像"
 
-#: gajim/dialogs.py:4859
+#: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "圖像"
 
-#: gajim/dialogs.py:4930
+#: gajim/dialogs.py:4933
 msgid "Choose Archive"
 msgstr "選擇歸檔檔案"
 
-#: gajim/dialogs.py:4949
+#: gajim/dialogs.py:4952
 msgid "Zip files"
 msgstr "Zip 檔案"
 
-#: gajim/dialogs.py:4975
+#: gajim/dialogs.py:4978
 #, python-format
 msgid "When %s becomes:"
 msgstr "當 %s 變為:"
 
-#: gajim/dialogs.py:4977
+#: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在為 %s 加入特殊提示"
 
-#: gajim/dialogs.py:5226
+#: gajim/dialogs.py:5220
 msgid "an audio and video"
 msgstr "一個音訊和視訊"
 
-#: gajim/dialogs.py:5228
+#: gajim/dialogs.py:5222
 msgid "an audio"
 msgstr "一個音訊"
 
-#: gajim/dialogs.py:5230
+#: gajim/dialogs.py:5224
 msgid "a video"
 msgstr "一個視訊"
 
-#: gajim/dialogs.py:5234
+#: gajim/dialogs.py:5228
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s 想要與您發起一個 %(type)s 作業階段。您要回應嗎?"
 
-#: gajim/dialogs.py:5339 gajim/dialogs.py:5375
+#: gajim/dialogs.py:5333 gajim/dialogs.py:5369
 #, python-format
 msgid "Certificate for account %s"
 msgstr "帳號憑證 %s"
 
-#: gajim/dialogs.py:5339
+#: gajim/dialogs.py:5333
 #, fuzzy, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -1694,68 +1768,96 @@ msgstr ""
 "<b>指紋</b>\n"
 "SHA1 指紋:%(sha1)s"
 
-#: gajim/dialogs.py:5386 gajim/gui_interface.py:1361
+#: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
 #, fuzzy, python-format
 msgid "SSL Certificate Verification for %s"
 msgstr "SSL 憑證驗證"
 
-#: gajim/dialogs.py:5387 gajim/dialogs.py:5404
+#: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 #, fuzzy
 msgid "View cert…"
 msgstr "檢視憑證…"
 
-#: gajim/groupchat_control.py:179 gajim/groupchat_control.py:1760
+#: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
+#, fuzzy
+msgid "File Transfer"
+msgstr "檔案傳輸"
+
+#: gajim/dialogs.py:5438
+msgid "Requesting HTTP Upload Slot..."
+msgstr ""
+
+#: gajim/dialogs.py:5442
+msgid "Uploading file via HTTP File Upload..."
+msgstr ""
+
+#: gajim/dialogs.py:5446
+#, fuzzy
+msgid "Encrypting file..."
+msgstr "E2E 加密被停用"
+
+#: gajim/groupchat_control.py:192 gajim/groupchat_control.py:1792
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s 現在成了 %(new_nick)s"
 
-#: gajim/groupchat_control.py:205 gajim/groupchat_control.py:1909
-#: gajim/history_window.py:482 gajim/common/connection_handlers_events.py:2760
+#: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
+#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的狀態是 %(status)s"
 
-#: gajim/groupchat_control.py:234
+#: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
 msgstr "傳送私有訊息失敗"
 
-#: gajim/groupchat_control.py:236
+#: gajim/groupchat_control.py:249
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在聊天室\"%(room)s\"中或\"%(nick)s\"已離開。"
 
-#: gajim/groupchat_control.py:594 gajim/groupchat_control.py:2277
+#: gajim/groupchat_control.py:636 gajim/chat_control.py:323
+#: gajim/chat_control.py:327
+msgid "HTTP File Upload"
+msgstr ""
+
+#: gajim/groupchat_control.py:638
+#, fuzzy
+msgid "HTTP File Upload not supported by your server"
+msgstr "您的伺服器不支援儲存元聯絡人資訊"
+
+#: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
 msgstr "正在更換話題"
 
-#: gajim/groupchat_control.py:595 gajim/groupchat_control.py:2278
+#: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
 msgstr "請指定新話題:"
 
-#: gajim/groupchat_control.py:602
+#: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
 msgstr "正在更換暱稱"
 
-#: gajim/groupchat_control.py:603
+#: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
 msgstr "請指定您想使用的新暱稱:"
 
-#: gajim/groupchat_control.py:620
+#: gajim/groupchat_control.py:677
 #, fuzzy
 msgid "Invalid group chat JID"
 msgstr "無效的聊天室 Jabber ID"
 
-#: gajim/groupchat_control.py:621
+#: gajim/groupchat_control.py:678
 #, fuzzy
 msgid "The group chat JID has not allowed characters."
 msgstr "聊天室 Jabber ID 包含不合法字元。"
 
-#: gajim/groupchat_control.py:627
+#: gajim/groupchat_control.py:684
 #, python-format
 msgid "Destroying %s"
 msgstr "正在銷毀 %s"
 
-#: gajim/groupchat_control.py:628
+#: gajim/groupchat_control.py:685
 #, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
@@ -1764,270 +1866,280 @@ msgstr ""
 "您正要徹底銷毀這個聊天室。\n"
 "您可以在下面指定一個原因:"
 
-#: gajim/groupchat_control.py:630
+#: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
 msgstr "您也可以輸入一個可選的替代地點:"
 
-#: gajim/groupchat_control.py:808
+#: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
 msgstr "插入暱稱"
 
-#: gajim/groupchat_control.py:960 gajim/chat_control.py:796
+#: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
 msgstr "且已被認證"
 
-#: gajim/groupchat_control.py:964 gajim/chat_control.py:800
+#: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
 msgstr "且未被認證"
 
-#: gajim/groupchat_control.py:968 gajim/chat_control.py:804
+#: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
 #, fuzzy, python-format
 msgid "%(type)s encryption is active %(authenticated)s."
 msgstr ""
 "%(type)s 加密 %(status)s 活動 %(authenticated)s。\n"
 "您的聊天作業階段 %(logged)s 將被記錄。"
 
-#: gajim/groupchat_control.py:1022
+#: gajim/groupchat_control.py:1066
 msgid "Conversation with "
 msgstr "對話，與"
 
-#: gajim/groupchat_control.py:1024
+#: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
 msgstr "繼續對話"
 
-#: gajim/groupchat_control.py:1382
+#: gajim/groupchat_control.py:1426
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s 將主題設定為 %(subject)s"
 
-#: gajim/groupchat_control.py:1405 gajim/groupchat_control.py:1702
+#: gajim/groupchat_control.py:1449 gajim/groupchat_control.py:1734
 msgid "Any occupant is allowed to see your full JID"
 msgstr "所有室友可以看到您的全部 JID"
 
-#: gajim/groupchat_control.py:1408
+#: gajim/groupchat_control.py:1452
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "聊天室現在顯示了無法使用的成員"
 
-#: gajim/groupchat_control.py:1410
+#: gajim/groupchat_control.py:1454
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "聊天室現在不顯示無法使用的成員"
 
-#: gajim/groupchat_control.py:1412
+#: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
 msgstr ""
 
-#: gajim/groupchat_control.py:1416
+#: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
 msgstr "聊天室訊息記錄已啟用"
 
-#: gajim/groupchat_control.py:1418
+#: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
 msgstr "聊天室訊息記錄已停用"
 
-#: gajim/groupchat_control.py:1420
+#: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
 msgstr "聊天室現在是非匿名的"
 
-#: gajim/groupchat_control.py:1423
+#: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
 msgstr "聊天室現在是半匿名的"
 
-#: gajim/groupchat_control.py:1426
+#: gajim/groupchat_control.py:1470
 #, fuzzy
 msgid "Room is now fully anonymous"
 msgstr "聊天室現在是完全匿名的"
 
-#: gajim/groupchat_control.py:1466 gajim/chat_control.py:1243
+#: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: gajim/groupchat_control.py:1695 gajim/groupchat_control.py:2297
-#: gajim/roster_window.py:3116 gajim/gui_interface.py:622
+#: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
+#: gajim/roster_window.py:3129 gajim/gui_interface.py:621
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
 
-#: gajim/groupchat_control.py:1707
+#: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
 msgstr "聊天室記錄被啟用"
 
-#: gajim/groupchat_control.py:1709
+#: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
 msgstr "一個新的聊天室被建立"
 
-#: gajim/groupchat_control.py:1712
+#: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
 msgstr "伺服器指定或修改了您的聊天室暱稱"
 
-#: gajim/groupchat_control.py:1718
+#: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出: %(reason)s"
 
-#: gajim/groupchat_control.py:1721
+#: gajim/groupchat_control.py:1753
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 踢出: %(reason)s"
 
-#: gajim/groupchat_control.py:1730
+#: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁: %(reason)s"
 
-#: gajim/groupchat_control.py:1733
+#: gajim/groupchat_control.py:1765
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁: %(reason)s"
 
-#: gajim/groupchat_control.py:1744 gajim/groupchat_control.py:1828
+#: gajim/groupchat_control.py:1776 gajim/groupchat_control.py:1860
 #, python-format
 msgid "You are now known as %s"
 msgstr "您現在成了 %s "
 
-#: gajim/groupchat_control.py:1782 gajim/groupchat_control.py:1787
-#: gajim/groupchat_control.py:1793
+#: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
+#: gajim/groupchat_control.py:1825
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
 
-#: gajim/groupchat_control.py:1784
+#: gajim/groupchat_control.py:1816
 msgid "affiliation changed"
 msgstr "歸屬變更"
 
-#: gajim/groupchat_control.py:1789
+#: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
 msgstr "聊天室配置變為\"僅成員\""
 
-#: gajim/groupchat_control.py:1795
+#: gajim/groupchat_control.py:1827
 msgid "system shutdown"
 msgstr "系統關閉"
 
-#: gajim/groupchat_control.py:1849
+#: gajim/groupchat_control.py:1881
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(nick)s 的歸屬被 %(actor)s 設定為 %(affiliation)s"
 
-#: gajim/groupchat_control.py:1853
+#: gajim/groupchat_control.py:1885
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s 的歸屬被設定為 %(affiliation)s"
 
-#: gajim/groupchat_control.py:1868
+#: gajim/groupchat_control.py:1900
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s 的角色被 %(actor)s 設定為 %(role)s"
 
-#: gajim/groupchat_control.py:1872
+#: gajim/groupchat_control.py:1904
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s 的角色被設定為 %(role)s"
 
-#: gajim/groupchat_control.py:1902
+#: gajim/groupchat_control.py:1934
 #, python-format
 msgid "%s has left"
 msgstr "%s 離開了"
 
-#: gajim/groupchat_control.py:1907
+#: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: gajim/groupchat_control.py:2236
+#: gajim/groupchat_control.py:2278
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "您確定要離開聊天室\"%s\"嗎?"
 
-#: gajim/groupchat_control.py:2238
+#: gajim/groupchat_control.py:2280
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果關閉此視窗，您將中斷此聊天室的連線。"
 
-#: gajim/groupchat_control.py:2446
+#: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
 msgstr "將踢走 %s"
 
-#: gajim/groupchat_control.py:2447 gajim/groupchat_control.py:2733
+#: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
 msgstr "您可以指定一個原因:"
 
-#: gajim/groupchat_control.py:2732
+#: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
 msgstr "將封禁 %s"
 
-#: gajim/chat_control.py:367
+#: gajim/chat_control.py:325 gajim/chat_control.py:329
+#, fuzzy
+msgid "Jingle File Transfer"
+msgstr "檔案傳輸"
+
+#: gajim/chat_control.py:331
+#, fuzzy
+msgid "No File Transfer available"
+msgstr "檔案傳輸完成"
+
+#: gajim/chat_control.py:392
 msgid "Show a list of formattings"
 msgstr "顯示格式清單(Alt+M)"
 
-#: gajim/chat_control.py:371
+#: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
 msgstr ""
 
-#: gajim/chat_control.py:374
+#: gajim/chat_control.py:399
 #, fuzzy
 msgid "This contact does not support HTML"
 msgstr "這個聯絡人不支援檔案傳輸"
 
-#: gajim/chat_control.py:486
+#: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 狀態: %(state)s，原因: %(reason)s"
 
-#: gajim/chat_control.py:648
+#: gajim/chat_control.py:652
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "聊天室 %(room_name)s 的 %(nickname)s"
 
-#: gajim/chat_control.py:882
+#: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
 msgstr "作業階段協商已取消"
 
-#: gajim/chat_control.py:892
+#: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
 msgstr "本次作業階段將在伺服器上被存檔"
 
-#: gajim/chat_control.py:894
+#: gajim/chat_control.py:898
 msgid "This session WILL NOT be archived on server"
 msgstr "本次作業階段將不會在伺服器上被存檔"
 
-#: gajim/chat_control.py:903
+#: gajim/chat_control.py:907
 msgid "This session is encrypted"
 msgstr "本次作業階段已被加密"
 
-#: gajim/chat_control.py:906
+#: gajim/chat_control.py:910
 msgid " and WILL be logged"
 msgstr "且會被記錄"
 
-#: gajim/chat_control.py:908
+#: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
 msgstr "且不會被記錄"
 
-#: gajim/chat_control.py:913
+#: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "遠端聯絡人的身分未確認。點擊盾型按鈕檢視詳情。"
 
-#: gajim/chat_control.py:915
+#: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
 msgstr "E2E 加密被停用"
 
-#: gajim/chat_control.py:1210
+#: gajim/chat_control.py:1218
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "您剛剛收到一條來自 \"%s\" 的訊息"
 
-#: gajim/chat_control.py:1212
+#: gajim/chat_control.py:1220
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您關閉此標籤並且停用了命令歷程，此訊息會丟失。"
 
-#: gajim/chat_control.py:1360
+#: gajim/chat_control.py:1363
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -2036,7 +2148,7 @@ msgstr ""
 "主題: %(subject)s\n"
 "%(message)s"
 
-#: gajim/chat_control.py:1474 gajim/gui_interface.py:1153
+#: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -2045,96 +2157,96 @@ msgstr ""
 "無法解密來自 %s 的訊息\n"
 "它可能被篡改了。"
 
-#: gajim/chat_control.py:1512
+#: gajim/chat_control.py:1515
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s 的狀態是 %(status)s"
 
-#: gajim/chat_control.py:1571
+#: gajim/chat_control.py:1574
 #, fuzzy
 msgid "File transfer"
 msgstr "檔案傳輸"
 
-#: gajim/chat_control.py:1574
+#: gajim/chat_control.py:1577
 #, fuzzy
 msgid "Size"
 msgstr "大小:  %s"
 
-#: gajim/chat_control.py:1576
+#: gajim/chat_control.py:1579
 #, fuzzy
 msgid "_Accept"
 msgstr "帳號(_A)"
 
-#: gajim/chat_control.py:1630 gajim/disco.py:1752
+#: gajim/chat_control.py:1633 gajim/disco.py:1752
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: gajim/chat_control.py:1649 gajim/roster_window.py:1979
-#: gajim/gui_interface.py:1014
+#: gajim/chat_control.py:1652 gajim/roster_window.py:1991
+#: gajim/gui_interface.py:1013
 msgid "Remote contact stopped transfer"
 msgstr "遠端聯絡人停止了傳輸"
 
-#: gajim/chat_control.py:1651 gajim/roster_window.py:1981
-#: gajim/gui_interface.py:1017
+#: gajim/chat_control.py:1654 gajim/roster_window.py:1993
+#: gajim/gui_interface.py:1016
 msgid "Error opening file"
 msgstr "開啟檔案錯誤"
 
-#: gajim/roster_window.py:255 gajim/roster_window.py:1063
+#: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
 msgstr "已合併的帳號"
 
-#: gajim/roster_window.py:842 gajim/roster_window.py:1745
-#: gajim/roster_window.py:1747 gajim/roster_window.py:2590
-#: gajim/roster_window.py:5120 gajim/message_window.py:546
-#: gajim/common/contacts.py:135 gajim/common/commands.py:230
-#: gajim/common/helpers.py:94
+#: gajim/roster_window.py:857 gajim/roster_window.py:1757
+#: gajim/roster_window.py:1759 gajim/roster_window.py:2602
+#: gajim/roster_window.py:5128 gajim/message_window.py:543
+#: gajim/common/contacts.py:133 gajim/common/commands.py:230
+#: gajim/common/helpers.py:95
 msgid "Groupchats"
 msgstr "多人聊天"
 
-#: gajim/roster_window.py:881 gajim/roster_window.py:1653
-#: gajim/roster_window.py:1686 gajim/roster_window.py:1737
-#: gajim/roster_window.py:1739 gajim/roster_window.py:1900
-#: gajim/roster_window.py:2563 gajim/roster_window.py:5150 gajim/disco.py:130
-#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:137
-#: gajim/common/contacts.py:380 gajim/common/helpers.py:94
+#: gajim/roster_window.py:896 gajim/roster_window.py:1665
+#: gajim/roster_window.py:1698 gajim/roster_window.py:1749
+#: gajim/roster_window.py:1751 gajim/roster_window.py:1912
+#: gajim/roster_window.py:2575 gajim/roster_window.py:5158 gajim/disco.py:130
+#: gajim/disco.py:131 gajim/disco.py:1459 gajim/common/contacts.py:135
+#: gajim/common/contacts.py:378 gajim/common/helpers.py:95
 msgid "Transports"
 msgstr "服務代理"
 
-#: gajim/roster_window.py:2033
+#: gajim/roster_window.py:2045
 #, fuzzy
 msgid "Authorization sent"
 msgstr "授權傳送成功"
 
-#: gajim/roster_window.py:2034
+#: gajim/roster_window.py:2046
 #, fuzzy, python-format
 msgid "\"%s\" will now see your status."
 msgstr "現在\"%s\"將知道您的狀態。"
 
-#: gajim/roster_window.py:2057
+#: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
 msgstr "認證請求已發出"
 
-#: gajim/roster_window.py:2058
+#: gajim/roster_window.py:2070
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果\"%s\"接受此請求，您將知道他/她的狀態。"
 
-#: gajim/roster_window.py:2072
+#: gajim/roster_window.py:2084
 #, fuzzy
 msgid "Authorization removed"
 msgstr "授權被移除"
 
-#: gajim/roster_window.py:2073
+#: gajim/roster_window.py:2085
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 將一直看到您的狀態為離線。"
 
-#: gajim/roster_window.py:2097
+#: gajim/roster_window.py:2109
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG 無法使用"
 
-#: gajim/roster_window.py:2098
+#: gajim/roster_window.py:2110
 #, python-format
 msgid ""
 "Gajim needs python-gnupg >= 0.3.8\n"
@@ -2142,47 +2254,47 @@ msgid ""
 "You will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/roster_window.py:2306 gajim/roster_window.py:3614
+#: gajim/roster_window.py:2318 gajim/roster_window.py:3625
 msgid "You are participating in one or more group chats"
 msgstr "您正在參與一個或多個多人聊天"
 
-#: gajim/roster_window.py:2307 gajim/roster_window.py:3615
+#: gajim/roster_window.py:2319 gajim/roster_window.py:3626
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr "隱身將使您從這些聊天室插斷開。確定要隱身?"
 
-#: gajim/roster_window.py:2334
+#: gajim/roster_window.py:2346
 msgid "desync'ed"
 msgstr "未同步"
 
-#: gajim/roster_window.py:2404
+#: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
 msgstr "真得要離開 Gajim?"
 
-#: gajim/roster_window.py:2405
+#: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
 msgstr "您確定您要離開 Gajim 嗎?"
 
-#: gajim/roster_window.py:2406
+#: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "總是關閉 Gajim"
 
-#: gajim/roster_window.py:2493
+#: gajim/roster_window.py:2505
 msgid "You have running file transfers"
 msgstr "您有傳送中的檔案"
 
-#: gajim/roster_window.py:2494
+#: gajim/roster_window.py:2506
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "如果現在離開，傳送中的檔案會停止傳輸。您仍然要離開嗎?"
 
-#: gajim/roster_window.py:2525 gajim/roster_window.py:2815
+#: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
 msgstr "您有未讀訊息"
 
-#: gajim/roster_window.py:2526
+#: gajim/roster_window.py:2538
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -2190,93 +2302,93 @@ msgstr ""
 "除非您啟用了命令歷程記錄而且向您傳送訊息的聯絡人在您的聯絡人清單中，您才能\n"
 "在以後讀到這些訊息。"
 
-#: gajim/roster_window.py:2816
+#: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
 msgstr "在移除代理之前您必須檢視它們。"
 
-#: gajim/roster_window.py:2819
+#: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理\"%s\"將被移除"
 
-#: gajim/roster_window.py:2820
+#: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您將無法再和使用這個代理的聯絡人收發訊息。"
 
-#: gajim/roster_window.py:2823
+#: gajim/roster_window.py:2836
 msgid "Transports will be removed"
 msgstr "代理將被移除"
 
-#: gajim/roster_window.py:2828
+#: gajim/roster_window.py:2841
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "您無法再和來自這些代理的聯絡人收發訊息: %s"
 
-#: gajim/roster_window.py:2879
+#: gajim/roster_window.py:2892
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您將要阻斷一個聯絡人。您確定要繼續嗎?"
 
-#: gajim/roster_window.py:2881
+#: gajim/roster_window.py:2894
 #, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr "這個聯絡人將看到您離線並且您不會在收到他傳送給您的訊息。"
 
-#: gajim/roster_window.py:2921
+#: gajim/roster_window.py:2934
 msgid "Rename Contact"
 msgstr "重新命名聯絡人"
 
-#: gajim/roster_window.py:2922
+#: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "為聯絡人 %s 輸入新的暱稱"
 
-#: gajim/roster_window.py:2929
+#: gajim/roster_window.py:2942
 msgid "Rename Group"
 msgstr "重新命名群組"
 
-#: gajim/roster_window.py:2930
+#: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "為群組 %s 輸入新的名稱"
 
-#: gajim/roster_window.py:2975
+#: gajim/roster_window.py:2988
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: gajim/roster_window.py:2976
+#: gajim/roster_window.py:2989
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想從聯絡人清單中刪除組 %s ?"
 
-#: gajim/roster_window.py:2977
+#: gajim/roster_window.py:2990
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同時從聯絡人清單移除這個群組的所有聯絡人"
 
-#: gajim/roster_window.py:3016
+#: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
 msgstr "指定 OpenPGP 密鑰"
 
-#: gajim/roster_window.py:3017
+#: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
 msgstr "選擇一個對應於該聯絡人的密鑰。"
 
-#: gajim/roster_window.py:3425
+#: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "聯絡人\"%s\"將從您的聯絡人清單中被移除"
 
-#: gajim/roster_window.py:3427
+#: gajim/roster_window.py:3438
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "您將從您的聯絡人清單中將 \"%(name)s\" (%(jid)s) 移除。\n"
 
-#: gajim/roster_window.py:3432
+#: gajim/roster_window.py:3443
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
@@ -2285,26 +2397,26 @@ msgstr ""
 "移除這些聯絡人: %s 的同時\n"
 "將移除認證導致他們將一直看到您為離線。"
 
-#: gajim/roster_window.py:3438
+#: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "您要繼續嗎?"
 
-#: gajim/roster_window.py:3442
+#: gajim/roster_window.py:3453
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in them always seeing you as offline."
 msgstr "移除此聯絡人的同時將預設移除認證，導致他/她將一直看到您為離線。"
 
-#: gajim/roster_window.py:3445
+#: gajim/roster_window.py:3456
 msgid "I want this contact to know my status after removal"
 msgstr "我想讓此聯絡人在被移除之後仍然知道我的狀態"
 
-#: gajim/roster_window.py:3449
+#: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
 msgstr "聯絡人將從您的聯絡人清單中被移除"
 
-#: gajim/roster_window.py:3454
+#: gajim/roster_window.py:3465
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -2313,13 +2425,13 @@ msgstr ""
 "移除這些聯絡人: %s 的同時\n"
 "將移除認證導致他們將一直看到您為離線。"
 
-#: gajim/roster_window.py:3512
+#: gajim/roster_window.py:3523
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr "您將傳送一個自訂的狀態。您確定要繼續嗎?"
 
-#: gajim/roster_window.py:3514
+#: gajim/roster_window.py:3525
 #, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -2328,24 +2440,24 @@ msgstr ""
 "這個聯絡人會暫時看到您的狀態為 %(status)s，直到您下次變更您的狀態。之後\n"
 "他/她會看到您的全域狀態。"
 
-#: gajim/roster_window.py:3533
+#: gajim/roster_window.py:3544
 msgid "No account available"
 msgstr "沒有有效帳號"
 
-#: gajim/roster_window.py:3534
+#: gajim/roster_window.py:3545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必須在與他人聊天前新增帳號。"
 
-#: gajim/roster_window.py:3665 gajim/gui_interface.py:2017
+#: gajim/roster_window.py:3676 gajim/gui_interface.py:2058
 #: gajim/dialog_messages.py:64
 msgid "You cannot join a group chat while you are invisible"
 msgstr "隱身時無法加入聊天室"
 
-#: gajim/roster_window.py:4167
+#: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的伺服器不支援儲存元聯絡人資訊"
 
-#: gajim/roster_window.py:4169
+#: gajim/roster_window.py:4180
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -2353,12 +2465,12 @@ msgid ""
 msgstr ""
 "您的伺服器不支援儲存元聯絡人資訊。所以這些資訊在下次重新連線時不會被儲存。"
 
-#: gajim/roster_window.py:4265
+#: gajim/roster_window.py:4276
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在建立一個元聯絡人。確定繼續?"
 
-#: gajim/roster_window.py:4267
+#: gajim/roster_window.py:4278
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -2367,193 +2479,193 @@ msgstr ""
 "元聯絡人是將幾個聯絡人組合起來顯示在同一列。一般在某個人有幾個 Jabber\n"
 "帳號或代理帳號時用到。"
 
-#: gajim/roster_window.py:4389
+#: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
 msgstr "無效的檔案位址:"
 
-#: gajim/roster_window.py:4401
+#: gajim/roster_window.py:4412
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "您想要將檔案傳送給 %s 嗎:"
 
-#: gajim/roster_window.py:4540
+#: gajim/roster_window.py:4552
 #, fuzzy, python-format
 msgid "Send %(from)s to %(to)s"
 msgstr "傳送 %s 給 %s"
 
-#: gajim/roster_window.py:4553
+#: gajim/roster_window.py:4565
 #, python-format
 msgid "Make %s first contact"
 msgstr "將 %s 設為第一聯絡人"
 
-#: gajim/roster_window.py:4558
+#: gajim/roster_window.py:4570
 #, fuzzy, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
 msgstr "將 %s 與 %s 設為中繼聯絡人"
 
-#: gajim/roster_window.py:4946 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
 msgstr "變更狀態訊息(_C)"
 
-#: gajim/roster_window.py:4966
+#: gajim/roster_window.py:4974
 msgid "Publish Tune"
 msgstr "發布音樂"
 
-#: gajim/roster_window.py:4977
+#: gajim/roster_window.py:4985
 msgid "Publish Location"
 msgstr "發布位置資訊"
 
-#: gajim/roster_window.py:4989
+#: gajim/roster_window.py:4997
 #, fuzzy
 msgid "Configure Services…"
 msgstr "配置服務…"
 
-#: gajim/roster_window.py:5122
+#: gajim/roster_window.py:5130
 msgid "_Maximize All"
 msgstr "放到最大全部(_M)"
 
-#: gajim/roster_window.py:5129 gajim/roster_window.py:5291
+#: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
 msgstr "傳送群組訊息(_E)"
 
-#: gajim/roster_window.py:5136
+#: gajim/roster_window.py:5144
 msgid "To all users"
 msgstr "向所有的使用者"
 
-#: gajim/roster_window.py:5140
+#: gajim/roster_window.py:5148
 msgid "To all online users"
 msgstr "向所有線上使用者"
 
-#: gajim/roster_window.py:5152 gajim/roster_window.py:5297
+#: gajim/roster_window.py:5160 gajim/roster_window.py:5305
 #: gajim/data/gui/gc_occupants_menu.ui:110
 #: gajim/data/gui/contact_context_menu.ui:36
 msgid "In_vite to"
 msgstr "邀請到(_V)"
 
-#: gajim/roster_window.py:5307
+#: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
 msgstr "管理聯絡人(_M)"
 
-#: gajim/roster_window.py:5313
+#: gajim/roster_window.py:5321
 #, fuzzy
 msgid "Edit _Groups…"
 msgstr "編輯群組(_G)"
 
-#: gajim/roster_window.py:5334 gajim/data/gui/remove_account_window.ui:137
+#: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
+#: gajim/data/gui/remove_account_window.ui:137
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: gajim/roster_window.py:5372
+#: gajim/roster_window.py:5380
 msgid "_Maximize"
 msgstr "放到最大(_M)"
 
-#: gajim/roster_window.py:5379
+#: gajim/roster_window.py:5387
 msgid "_Reconnect"
 msgstr "重新連線(_R)"
 
-#: gajim/roster_window.py:5384 gajim/data/gui/gc_control_popup_menu.ui:120
+#: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
 msgstr "中斷連線(_D)"
 
-#: gajim/roster_window.py:5392 gajim/data/gui/gc_occupants_menu.ui:162
+#: gajim/roster_window.py:5408 gajim/data/gui/gc_occupants_menu.ui:170
 #: gajim/data/gui/gc_control_popup_menu.ui:113
 #: gajim/data/gui/contact_context_menu.ui:228
 msgid "_History"
 msgstr "命令歷程(_H)"
 
-#: gajim/roster_window.py:5468 gajim/data/gui/application_menu.ui:86
+#: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
 msgstr "命令歷程記錄管理器"
 
-#: gajim/roster_window.py:5476
+#: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
 msgstr "加入新的聊天室(_J)"
 
-#: gajim/roster_window.py:5774
-#, fuzzy
-msgid "Change Status Message…"
-msgstr "變更狀態訊息(_C)"
-
-#: gajim/gajim.py:68
+#: gajim/gajim.py:72
 #, fuzzy
 msgid "Show the application's version"
 msgstr "在通知區域顯示圖示:"
 
-#: gajim/gajim.py:71
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "只顯示在聯絡人清單中"
 
-#: gajim/gajim.py:74
+#: gajim/gajim.py:78
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:82
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:86
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "進階設定編輯器"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:90
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s 設定錯誤"
 
-#: gajim/gajim.py:89
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Configure logging system"
 msgstr "組配 %s"
 
-#: gajim/gajim.py:92
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Show all warnings"
 msgstr "顯示所有未處理事件(_E)"
 
-#: gajim/gajim.py:144 gajim/gui_interface.py:128
+#: gajim/gajim.py:99
+msgid "open ipython shell"
+msgstr ""
+
+#: gajim/gajim.py:159 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "資料庫錯誤"
 
-#: gajim/history_sync.py:220
+#: gajim/history_sync.py:217
 #, fuzzy
 msgid "How far back do you want to go?"
 msgstr "想做什麼?"
 
-#: gajim/history_sync.py:225
+#: gajim/history_sync.py:222
 msgid "One Month"
 msgstr ""
 
-#: gajim/history_sync.py:226
+#: gajim/history_sync.py:223
 msgid "Three Months"
 msgstr ""
 
-#: gajim/history_sync.py:227
+#: gajim/history_sync.py:224
 msgid "One Year"
 msgstr ""
 
-#: gajim/history_sync.py:228
+#: gajim/history_sync.py:225
 msgid "Everything"
 msgstr ""
 
-#: gajim/history_sync.py:257
+#: gajim/history_sync.py:254
 #, fuzzy
 msgid "Connecting..."
 msgstr "正在連線"
 
-#: gajim/history_sync.py:269
+#: gajim/history_sync.py:266
 #, fuzzy, python-format
 msgid "%(received)s of %(max)s"
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/history_sync.py:273
+#: gajim/history_sync.py:270
 #, fuzzy, python-format
 msgid "Downloaded %s Messages"
 msgstr "轉發未讀訊息"
 
-#: gajim/history_sync.py:293
+#: gajim/history_sync.py:290
 #, python-brace-format
 msgid ""
 "\n"
@@ -2562,7 +2674,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:300
+#: gajim/history_sync.py:297
 msgid ""
 "\n"
 "        Gajim is fully synchronised\n"
@@ -2570,7 +2682,7 @@ msgid ""
 "        "
 msgstr ""
 
-#: gajim/history_sync.py:307
+#: gajim/history_sync.py:304
 msgid ""
 "\n"
 "        There is already a synchronisation in\n"
@@ -2715,16 +2827,16 @@ msgstr "帳號被停用"
 msgid "To unregister from a server, account must be enabled."
 msgstr "要從伺服器移除註冊，帳號必須被啟用。"
 
-#: gajim/config.py:1821 gajim/gui_interface.py:315 gajim/gui_interface.py:749
+#: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
 msgstr "需要密碼"
 
-#: gajim/config.py:1822 gajim/gui_interface.py:734
+#: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "輸入帳號 %s 的密碼"
 
-#: gajim/config.py:1823 gajim/gui_interface.py:749
+#: gajim/config.py:1823 gajim/gui_interface.py:748
 msgid "Save password"
 msgstr "儲存密碼"
 
@@ -2754,10 +2866,18 @@ msgstr "僅從 Gajim 移除帳號"
 msgid "Don't remove anything. I'll try again later"
 msgstr "不要移除任何東西。我過一會兒會重試一下"
 
+#: gajim/config.py:1947
+msgid "?print_status:All"
+msgstr "全部"
+
 #: gajim/config.py:1948
 msgid "Enter and leave only"
 msgstr "只是進入和離開"
 
+#: gajim/config.py:1949
+msgid "?print_status:None"
+msgstr "無"
+
 #: gajim/config.py:2015
 msgid "New Group Chat"
 msgstr "新聊天室"
@@ -2821,11 +2941,11 @@ msgstr "無效輸入"
 msgid "Custom port must be a port number."
 msgstr "自訂連接埠必須為連接埠號碼。"
 
-#: gajim/config.py:2536 gajim/gui_interface.py:1316
+#: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
 msgstr "證書已經在檔案中"
 
-#: gajim/config.py:2537 gajim/gui_interface.py:1317
+#: gajim/config.py:2537 gajim/gui_interface.py:1358
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "證書已經在檔案 %s 中，所以它沒有被再次加入。"
@@ -2929,90 +3049,112 @@ msgstr "多人聊天訊息高亮度顯示"
 msgid "Group Chat Message Received"
 msgstr "收到的多人聊天訊息"
 
-#: gajim/tooltips.py:376
+#: gajim/tooltips.py:237
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此聊天室的 %(owner_or_admin_or_member)s"
 
-#: gajim/tooltips.py:402 gajim/common/helpers.py:478
+#: gajim/tooltips.py:263 gajim/common/helpers.py:473
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "無"
+
+#: gajim/tooltips.py:265 gajim/common/helpers.py:479
 msgid "Member"
 msgstr "成員"
 
-#: gajim/tooltips.py:404 gajim/common/helpers.py:476
+#: gajim/tooltips.py:267 gajim/common/helpers.py:477
 msgid "Administrator"
 msgstr "管理員"
 
-#: gajim/tooltips.py:406 gajim/common/helpers.py:474
+#: gajim/tooltips.py:269 gajim/common/helpers.py:475
 msgid "Owner"
 msgstr "所有者"
 
-#: gajim/tooltips.py:560
+#: gajim/tooltips.py:423
 msgid " [blocked]"
 msgstr "[已阻斷]"
 
-#: gajim/tooltips.py:564
+#: gajim/tooltips.py:427
 msgid " [minimized]"
 msgstr "[最小化的]"
 
-#: gajim/tooltips.py:732
+#: gajim/tooltips.py:596
 msgid "Connected"
 msgstr "已連線"
 
-#: gajim/tooltips.py:734
+#: gajim/tooltips.py:598
 msgid "Disconnected"
 msgstr "已中斷連線"
 
-#: gajim/tooltips.py:787
+#: gajim/tooltips.py:647
+#, fuzzy
+msgid "?Noun:Download"
+msgstr "下載"
+
+#: gajim/tooltips.py:653
+#, fuzzy
+msgid "?Noun:Upload"
+msgstr "上傳"
+
+#: gajim/tooltips.py:660
 msgid "Type: "
 msgstr "類型: "
 
-#: gajim/tooltips.py:793
+#: gajim/tooltips.py:666
 msgid "Transferred: "
 msgstr "已傳輸: "
 
-#: gajim/tooltips.py:796 gajim/tooltips.py:813
+#: gajim/tooltips.py:669 gajim/tooltips.py:686
 msgid "Not started"
 msgstr "未開始"
 
-#: gajim/tooltips.py:798
+#: gajim/tooltips.py:671
 msgid "Stopped"
 msgstr "已停止"
 
-#: gajim/tooltips.py:800 gajim/tooltips.py:803
+#: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
 msgstr "已完成"
 
-#: gajim/tooltips.py:809
+#: gajim/tooltips.py:679
+msgid "?transfer status:Paused"
+msgstr "?transfer status:暫停"
+
+#: gajim/tooltips.py:682
 msgid "Stalled"
 msgstr "已凍結"
 
-#: gajim/tooltips.py:811
+#: gajim/tooltips.py:684
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: gajim/tooltips.py:814
+#: gajim/tooltips.py:687
 msgid "Status: "
 msgstr "狀態: "
 
-#: gajim/tooltips.py:847 gajim/common/helpers.py:383
+#: gajim/tooltips.py:719 gajim/common/helpers.py:389
+msgid "?user status:Available"
+msgstr "線上"
+
+#: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: gajim/tooltips.py:849 gajim/common/commands.py:117
-#: gajim/common/helpers.py:395
+#: gajim/tooltips.py:723 gajim/common/commands.py:117
+#: gajim/common/helpers.py:396
 #: gajim/command_system/implementation/standard.py:138
 msgid "Away"
 msgstr "離開"
 
-#: gajim/tooltips.py:851 gajim/common/helpers.py:373
+#: gajim/tooltips.py:725 gajim/common/helpers.py:374
 msgid "Busy"
 msgstr "忙碌"
 
-#: gajim/tooltips.py:853 gajim/common/helpers.py:378
+#: gajim/tooltips.py:727 gajim/common/helpers.py:379
 msgid "Not Available"
 msgstr "離開很久了"
 
-#: gajim/tooltips.py:855 gajim/common/helpers.py:400
+#: gajim/tooltips.py:729 gajim/common/helpers.py:401
 msgid "Offline"
 msgstr "離線"
 
@@ -3061,122 +3203,126 @@ msgstr "(無)"
 msgid "Hidden"
 msgstr "隱藏"
 
-#: gajim/logind_listener.py:59
+#: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
 msgstr ""
 
-#: gajim/history_window.py:329
+#: gajim/logind_listener.py:90
+msgid "Disconnect from the network"
+msgstr ""
+
+#: gajim/history_window.py:327
 #, python-format
 msgid "Conversation History with %s"
 msgstr "與 %s 的聊天命令歷程"
 
-#: gajim/history_window.py:347 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "對話命令歷程"
 
-#: gajim/history_window.py:376
+#: gajim/history_window.py:374
 msgid "Disk Error"
 msgstr "磁碟錯誤"
 
-#: gajim/history_window.py:478
+#: gajim/history_window.py:476
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的狀態是 %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:487
 #, python-format
 msgid "Error: %s"
 msgstr "錯誤: %s"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:489
 msgid "Error"
 msgstr "錯誤"
 
-#: gajim/history_window.py:493
+#: gajim/history_window.py:491
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "現在狀態: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:496
+#: gajim/history_window.py:494
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "現在狀態:  %(status)s "
 
-#: gajim/history_window.py:517 gajim/conversation_textview.py:1341
+#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主題: %s\n"
 
-#: gajim/statusicon.py:233
+#: gajim/statusicon.py:215
 #, fuzzy
 msgid "_Change Status Message…"
 msgstr "變更狀態訊息(_C)"
 
-#: gajim/statusicon.py:268 gajim/statusicon.py:316 gajim/statusicon.py:323
+#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
 #, python-format
 msgid "using account %s"
 msgstr "使用帳號 %s"
 
-#: gajim/statusicon.py:333
+#: gajim/statusicon.py:315
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "書籤管理"
 
-#: gajim/statusicon.py:346
+#: gajim/statusicon.py:328
 msgid "Hide _Roster"
 msgstr "隱藏聯絡人清單(_R)"
 
-#: gajim/statusicon.py:350
+#: gajim/statusicon.py:332
 msgid "Show _Roster"
 msgstr "顯示聯絡人清單(_R)"
 
-#: gajim/statusicon.py:358
+#: gajim/statusicon.py:340
 msgid "Hide this menu"
 msgstr "隱藏本選單"
 
-#: gajim/dataforms_widget.py:588
+#: gajim/dataforms_widget.py:587
 msgid "Unable to load image"
 msgstr "無法載入圖像"
 
-#: gajim/dataforms_widget.py:590
+#: gajim/dataforms_widget.py:589
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "不支援的媒體類型: %s"
 
-#: gajim/dataforms_widget.py:605
+#: gajim/dataforms_widget.py:604
 msgid "This field is required"
 msgstr "此一項是必須的"
 
-#: gajim/dataforms_widget.py:659
+#: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: gajim/dataforms_widget.py:662 gajim/dataforms_widget.py:664
+#: gajim/dataforms_widget.py:661 gajim/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
 #: gajim/server_info.py:130
 #, python-format
-msgid "%s days, %s hours"
+msgid "%(days)s days, %(hours)s hours"
 msgstr ""
 
-#: gajim/server_info.py:186 gajim/accounts_window.py:536
+#: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
 #, fuzzy
 msgid "Hostname"
 msgstr "主機名稱(_H):"
 
-#: gajim/server_info.py:187
+#: gajim/server_info.py:188
 msgid "Server Software"
 msgstr ""
 
-#: gajim/server_info.py:188
+#: gajim/server_info.py:189
 #, fuzzy
 msgid "Server Uptime"
 msgstr "伺服器回應: %s"
 
-#: gajim/server_info.py:226
+#: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
@@ -3332,57 +3478,63 @@ msgstr "訂閱(_S)"
 msgid "_Unsubscribe"
 msgstr "退訂(_S)"
 
-#: gajim/conversation_textview.py:332
+#: gajim/conversation_textview.py:329
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "以下文字是您上次注意這個聊天室以來的聊天內容"
 
-#: gajim/conversation_textview.py:564
+#: gajim/conversation_textview.py:561
 msgid "_Quote"
 msgstr "參照(_Q)"
 
-#: gajim/conversation_textview.py:572
+#: gajim/conversation_textview.py:569
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\"的動作(_A)"
 
-#: gajim/conversation_textview.py:586
+#: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
 msgstr "檢視 Wikipedia 文章(_W)"
 
-#: gajim/conversation_textview.py:591
+#: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
 msgstr "從字典中搜尋(_D)"
 
-#: gajim/conversation_textview.py:608
+#: gajim/conversation_textview.py:605
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典位址中缺少 \"%s\" 並且它不是 \"WIKTIONARY\""
 
-#: gajim/conversation_textview.py:622
+#: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "網路搜尋位址缺少 \"%s\""
 
-#: gajim/conversation_textview.py:625
+#: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
 msgstr "在網際網路上搜尋(_S)"
 
-#: gajim/conversation_textview.py:631
+#: gajim/conversation_textview.py:628
 msgid "Open as _Link"
 msgstr "做為連結開啟(_L)"
 
-#: gajim/conversation_textview.py:850
+#: gajim/conversation_textview.py:847
 msgid "URL:"
 msgstr ""
 
-#: gajim/conversation_textview.py:1024
+#: gajim/conversation_textview.py:1021
 #, fuzzy
 msgid "Invalid URL"
 msgstr "無效的 JID"
 
-#: gajim/conversation_textview.py:1253
+#: gajim/conversation_textview.py:1106
+msgid ""
+"<b>Message corrected. Original message:</b>\n"
+"{}"
+msgstr ""
+
+#: gajim/conversation_textview.py:1250
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -3393,30 +3545,35 @@ msgstr[0] "%(nb_days)i天前"
 msgid "Write a message.."
 msgstr "狀態訊息"
 
-#: gajim/message_window.py:252
+#: gajim/message_window.py:245
 msgid "You are going to close several tabs"
 msgstr "您將要關閉多個標籤"
 
-#: gajim/message_window.py:253
+#: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
 msgstr "您確定要關閉所有這些嗎"
 
-#: gajim/message_window.py:548
+#: gajim/message_window.py:541
+#, fuzzy
+msgid "?Noun:Chats"
+msgstr "多人聊天"
+
+#: gajim/message_window.py:545
 msgid "Private Chats"
 msgstr "私人聊天"
 
-#: gajim/message_window.py:554
+#: gajim/message_window.py:551
 msgid "Messages"
 msgstr "訊息"
 
-#: gajim/gui_interface.py:158 gajim/gui_interface.py:330
-#: gajim/gui_interface.py:339 gajim/gui_interface.py:346
-#: gajim/gui_interface.py:350 gajim/gui_interface.py:353
-#: gajim/gui_interface.py:361
+#: gajim/gui_interface.py:157 gajim/gui_interface.py:329
+#: gajim/gui_interface.py:338 gajim/gui_interface.py:345
+#: gajim/gui_interface.py:349 gajim/gui_interface.py:352
+#: gajim/gui_interface.py:360
 msgid "Unable to join group chat"
 msgstr "無法加入聊天室"
 
-#: gajim/gui_interface.py:159
+#: gajim/gui_interface.py:158
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat\n"
@@ -3427,108 +3584,108 @@ msgstr ""
 "您在聊天室 %s 中希望使用的暱稱已經被使用或被其他人註冊了。\n"
 "在下面指定另一個暱稱:"
 
-#: gajim/gui_interface.py:163
+#: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
 msgstr "在發生衝突時總是使用這個暱稱"
 
-#: gajim/gui_interface.py:181
+#: gajim/gui_interface.py:180
 msgid "Do you accept this request?"
 msgstr "是否接受這個請求?"
 
-#: gajim/gui_interface.py:183
+#: gajim/gui_interface.py:182
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受這個對帳號 %s 的請求?"
 
-#: gajim/gui_interface.py:186
+#: gajim/gui_interface.py:185
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
 msgstr "%(url)s (id: %(id)s) 的 HTTP (%(method)s) 認證"
 
-#: gajim/gui_interface.py:230 gajim/notify.py:96
+#: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
 msgstr "連線失敗"
 
-#: gajim/gui_interface.py:316
+#: gajim/gui_interface.py:315
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "需要密碼才能加入聊天室 %s。請輸入一個密碼。"
 
-#: gajim/gui_interface.py:331
+#: gajim/gui_interface.py:330
 #, fuzzy, python-format
 msgid "<b>%s</b> is full"
 msgstr "<b>字型</b>"
 
-#: gajim/gui_interface.py:340
+#: gajim/gui_interface.py:339
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "您被多人聊天 <b>%s</b> 封禁。"
 
-#: gajim/gui_interface.py:347
+#: gajim/gui_interface.py:346
 #, fuzzy, python-format
 msgid "Remote server <b>%s</b> does not exist."
 msgstr "多人聊天 <b>%s</b> 不存在。"
 
-#: gajim/gui_interface.py:351
+#: gajim/gui_interface.py:350
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "多人聊天 <b>%s</b> 不存在。"
 
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:353
 #, fuzzy
 msgid "Group chat creation is not permitted."
 msgstr "聊天室建立是受限的。"
 
-#: gajim/gui_interface.py:356
+#: gajim/gui_interface.py:355
 #, fuzzy
 msgid "Unable to join groupchat"
 msgstr "無法加入聊天室"
 
-#: gajim/gui_interface.py:357
+#: gajim/gui_interface.py:356
 #, fuzzy, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
 msgstr "您已註冊的暱稱必須在多人聊天 <b>%s</b> 中使用。"
 
-#: gajim/gui_interface.py:362
+#: gajim/gui_interface.py:361
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不在聊天室 %s 的成員清單中。"
 
-#: gajim/gui_interface.py:456 gajim/gui_interface.py:460
+#: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "錯誤 %(code)s: %(msg)s"
 
-#: gajim/gui_interface.py:471 gajim/gui_interface.py:487
-#: gajim/common/connection_handlers_events.py:1408
+#: gajim/gui_interface.py:470 gajim/gui_interface.py:486
+#: gajim/common/connection_handlers_events.py:1420
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "傳送 %(message)s 時出現錯誤( %(error)s )"
 
-#: gajim/gui_interface.py:514 gajim/notify.py:96
+#: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
 msgstr "認證請求"
 
-#: gajim/gui_interface.py:525 gajim/common/contacts.py:133
-#: gajim/common/helpers.py:94
+#: gajim/gui_interface.py:524 gajim/common/contacts.py:131
+#: gajim/common/helpers.py:95
 msgid "Observers"
 msgstr "旁觀者"
 
-#: gajim/gui_interface.py:539
+#: gajim/gui_interface.py:538
 msgid "Authorization accepted"
 msgstr "授權被接受"
 
-#: gajim/gui_interface.py:540
+#: gajim/gui_interface.py:539
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "聯絡人\"%s\"已授權您檢視他/她的狀態。"
 
-#: gajim/gui_interface.py:548
+#: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "聯絡人\"%s\"移除了對您的認證"
 
-#: gajim/gui_interface.py:549
+#: gajim/gui_interface.py:548
 #, fuzzy
 msgid ""
 "You will always see them as offline.\n"
@@ -3537,31 +3694,31 @@ msgstr ""
 "您將一直看到他/她處於離線狀態。\n"
 "要將他/她從您的聯絡人清單中移除嗎?"
 
-#: gajim/gui_interface.py:571 gajim/notify.py:96
+#: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
 msgstr "已取消認證的"
 
-#: gajim/gui_interface.py:583
+#: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "無法與\"%s\"建立連線"
 
-#: gajim/gui_interface.py:584 gajim/common/connection.py:1270
-#: gajim/common/connection.py:1465
+#: gajim/gui_interface.py:583 gajim/common/connection.py:1282
+#: gajim/common/connection.py:1468
 msgid "Check your connection or try again later."
 msgstr "檢查連線或稍後重試。"
 
-#: gajim/gui_interface.py:642
+#: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
 msgstr ""
 
-#: gajim/gui_interface.py:646
+#: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
 msgstr ""
 
-#: gajim/gui_interface.py:676
+#: gajim/gui_interface.py:675
 #, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
@@ -3570,131 +3727,136 @@ msgstr ""
 "您配置了 Gajim 使用 GPG agent，但並沒有正在執行的 GPG agent 或是它回傳了一個"
 "錯誤的密碼。\n"
 
-#: gajim/gui_interface.py:679 gajim/gui_interface.py:687
+#: gajim/gui_interface.py:678 gajim/gui_interface.py:686
 msgid "You are currently connected without your OpenPGP key."
 msgstr "您已經連線，但沒有使用您的 OpenPGP 密鑰。"
 
-#: gajim/gui_interface.py:681
+#: gajim/gui_interface.py:680
 #, fuzzy
 msgid "Wrong passphrase"
 msgstr "錯誤欄位"
 
-#: gajim/gui_interface.py:686
+#: gajim/gui_interface.py:685
 #, fuzzy
 msgid "Wrong OpenPGP passphrase"
 msgstr "錯誤欄位"
 
-#: gajim/gui_interface.py:700
+#: gajim/gui_interface.py:699
 msgid "Certificate Passphrase Required"
 msgstr "要求憑證密語"
 
-#: gajim/gui_interface.py:701
+#: gajim/gui_interface.py:700
 #, fuzzy, python-format
 msgid "Enter the certificate passphrase for account %s"
 msgstr "輸入密語用於帳號憑證 %s"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid "Untrusted OpenPGP key"
 msgstr "選擇您的 OpenPGP 密鑰"
 
-#: gajim/gui_interface.py:724
+#: gajim/gui_interface.py:723
 #, fuzzy
 msgid ""
 "The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
 "to encrypt this message?"
 msgstr "用於加密這次對話的 GPG 密鑰未被信任。您確實想要加密這條訊息嗎?"
 
-#: gajim/gui_interface.py:770
+#: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
 
-#: gajim/gui_interface.py:773
+#: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
 msgstr ""
 
-#: gajim/gui_interface.py:925
+#: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想傳送給您一個檔案。"
 
-#: gajim/gui_interface.py:1022 gajim/gui_interface.py:1389
+#: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
 msgstr "SSL證書錯誤"
 
-#: gajim/gui_interface.py:1039
+#: gajim/gui_interface.py:1038
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "檔案傳輸完成"
 
-#: gajim/gui_interface.py:1061
+#: gajim/gui_interface.py:1060
 #, fuzzy, python-format
 msgid "%(filename)s received from %(name)s."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1065
+#: gajim/gui_interface.py:1064
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1069
+#: gajim/gui_interface.py:1068
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1082
+#: gajim/gui_interface.py:1081
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的給 %(name)s 傳送了檔案 %(filename)s。"
 
-#: gajim/gui_interface.py:1086
+#: gajim/gui_interface.py:1085
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1090
+#: gajim/gui_interface.py:1089
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
 
-#: gajim/gui_interface.py:1155
+#: gajim/gui_interface.py:1153
+#, fuzzy
+msgid "Choose file to send"
+msgstr "選擇要傳送的檔案…"
+
+#: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
 msgstr "無法解密訊息"
 
-#: gajim/gui_interface.py:1167
+#: gajim/gui_interface.py:1208
 msgid "Username Conflict"
 msgstr "使用者名稱衝突"
 
-#: gajim/gui_interface.py:1168
+#: gajim/gui_interface.py:1209
 msgid "Please type a new username for your local account"
 msgstr "<b>請在您本地帳號填寫新的使用者名稱</b>"
 
-#: gajim/gui_interface.py:1191
+#: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
 msgstr "資源衝突"
 
-#: gajim/gui_interface.py:1192
+#: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "您已經用同一個資源連線到這個帳號了。請輸入一個新的資源"
 
-#: gajim/gui_interface.py:1249
+#: gajim/gui_interface.py:1290
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要發起語音聊天。"
 
-#: gajim/gui_interface.py:1252
+#: gajim/gui_interface.py:1293
 msgid "Voice Chat Request"
 msgstr "語音聊天請求"
 
-#: gajim/gui_interface.py:1342
+#: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
 msgstr "驗證 SSL 證書發生錯誤"
 
-#: gajim/gui_interface.py:1343
+#: gajim/gui_interface.py:1384
 #, fuzzy, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your XMPP server: "
@@ -3705,7 +3867,7 @@ msgstr ""
 "%(error)s\n"
 "您仍然想要連線這個伺服器嗎?"
 
-#: gajim/gui_interface.py:1347
+#: gajim/gui_interface.py:1388
 #, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3718,15 +3880,15 @@ msgstr ""
 "這個證書的 SHA1 指紋資訊: \n"
 "%s"
 
-#: gajim/gui_interface.py:1353
+#: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
 msgstr "忽略這個證書的這個錯誤。"
 
-#: gajim/gui_interface.py:1366
+#: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
 msgstr ""
 
-#: gajim/gui_interface.py:1390
+#: gajim/gui_interface.py:1431
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed and is not "
@@ -3746,7 +3908,7 @@ msgstr ""
 "\n"
 "您仍想連線並更新證書的指紋資訊嗎?"
 
-#: gajim/gui_interface.py:1468
+#: gajim/gui_interface.py:1509
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -3754,39 +3916,39 @@ msgstr ""
 "您將透過不安全的連線傳送密碼。您應該安裝 PyOpenSSL 以阻止這樣的事情。您確定要"
 "這樣做嗎?"
 
-#: gajim/gui_interface.py:1510
+#: gajim/gui_interface.py:1551
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "您將透過不安全的連線傳送未經加密的密碼。您確定要這樣做嗎?"
 
-#: gajim/gui_interface.py:1807
+#: gajim/gui_interface.py:1848
 #, fuzzy
 msgid "JID is not a Groupchat"
 msgstr "這不是一個聊天室"
 
-#: gajim/gui_interface.py:1964 gajim/gui_interface.py:1972
+#: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
 msgstr "表情圖示被停用"
 
-#: gajim/gui_interface.py:1965
+#: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "您配置的表情圖示主題找不到，所以表情圖示被停用。"
 
-#: gajim/gui_interface.py:1973
+#: gajim/gui_interface.py:2014
 #, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr "您配置的表情圖示主題找不到，所以表情圖示被停用。"
 
-#: gajim/gui_interface.py:1991
+#: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
 msgstr "這不是一個聊天室"
 
-#: gajim/gui_interface.py:1992
+#: gajim/gui_interface.py:2033
 #, python-format
 msgid ""
 "%(room_jid)s is already in your roster. Please check if %(room_jid)s is a "
@@ -3794,41 +3956,41 @@ msgid ""
 "joining the group chat again."
 msgstr ""
 
-#: gajim/gui_interface.py:2369
+#: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
 msgstr "無法儲存您的設定。"
 
-#: gajim/gui_interface.py:2742 gajim/common/config.py:117
-#: gajim/common/config.py:530 gajim/common/optparser.py:337
-#: gajim/common/optparser.py:505 gajim/common/optparser.py:528
+#: gajim/gui_interface.py:2796 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:341
+#: gajim/common/optparser.py:509 gajim/common/optparser.py:532
 msgid "default"
 msgstr "預設"
 
-#: gajim/gui_interface.py:2975
+#: gajim/gui_interface.py:2981
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: gajim/gui_interface.py:2976
+#: gajim/gui_interface.py:2982
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "輸入 GPG 密鑰 %(keyid)s (帳號 %(account)s) 的密碼。"
 
-#: gajim/gui_interface.py:2990
+#: gajim/gui_interface.py:2996
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG 密鑰過期"
 
-#: gajim/gui_interface.py:2991
+#: gajim/gui_interface.py:2997
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "您的 GPG 密鑰已過期，您將在沒有 OpenPGP 情況下連線到 %s。"
 
-#: gajim/gui_interface.py:3000
+#: gajim/gui_interface.py:3006
 msgid "Wrong Passphrase"
 msgstr "錯誤欄位"
 
-#: gajim/gui_interface.py:3001
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "請重新輸入您的 GPG 欄位或點\"取消\""
@@ -3897,6 +4059,11 @@ msgstr "- 訊息將會被記錄"
 msgid "- messages will not be logged"
 msgstr "- 訊息將不會被記錄"
 
+#: gajim/notify.py:103
+#, fuzzy
+msgid "Open"
+msgstr "OpenPGP: "
+
 #: gajim/dialog_messages.py:33
 #, fuzzy
 msgid "You can not start a new conversation unless you are connected."
@@ -3926,7 +4093,7 @@ msgstr "不合法的格式"
 msgid "The form is not filled correctly."
 msgstr "表格沒有被正確地填寫。"
 
-#: gajim/dialog_messages.py:63 gajim/common/helpers.py:405
+#: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4057,6 +4224,56 @@ msgstr ""
 "%s\n"
 "Link-local 訊息可能無法正常工作。"
 
+#: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
+#, fuzzy
+msgid "Could not request upload slot"
+msgstr "無法啟動本地服務"
+
+#: gajim/dialog_messages.py:143
+msgid "Got unexpected response from server (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
+#, fuzzy
+msgid "Could not open file"
+msgstr "無法讀取圖片"
+
+#: gajim/dialog_messages.py:148
+msgid "Exception raised while opening file (see log)"
+msgstr ""
+
+#: gajim/dialog_messages.py:157
+msgid "Unsecure"
+msgstr ""
+
+#: gajim/dialog_messages.py:158
+#, fuzzy
+msgid "Server returned unsecure transport (http)"
+msgstr "服務回傳了一個錯誤。"
+
+#: gajim/dialog_messages.py:162
+#, fuzzy
+msgid "Could not upload file"
+msgstr "無法讀取圖片"
+
+#: gajim/dialog_messages.py:163
+#, python-format
+msgid "HTTP response code from server: %s"
+msgstr ""
+
+#: gajim/dialog_messages.py:167
+msgid "Upload Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:172
+msgid "Encryption Error"
+msgstr ""
+
+#: gajim/dialog_messages.py:173
+#, fuzzy
+msgid "For the choosen encryption is no encryption method available"
+msgstr "一個連線無法使用"
+
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "主題"
@@ -4082,7 +4299,17 @@ msgstr "無法刪除目前主題"
 msgid "Pick another theme to use first."
 msgstr ""
 
-#: gajim/accounts_window.py:153 gajim/common/config.py:509
+#: gajim/accounts_window.py:40
+#, fuzzy
+msgid "Merge Accounts"
+msgstr "已合併的帳號"
+
+#: gajim/accounts_window.py:41
+#, fuzzy
+msgid "Use PGP Agent"
+msgstr "使用 G_PG Agent"
+
+#: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
 msgstr "很快回來。"
 
@@ -4103,6 +4330,11 @@ msgstr "您已在帳號 %s 開啟聊天"
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和多人聊天視窗將會關閉。您想繼續嗎?"
 
+#: gajim/accounts_window.py:344
+#, fuzzy
+msgid "Remove"
+msgstr "移除(_R)"
+
 #: gajim/accounts_window.py:387
 #, fuzzy
 msgid "Rename account label"
@@ -4298,49 +4530,63 @@ msgstr "變更密碼"
 msgid "Login Options"
 msgstr "表情(_E):"
 
-#: gajim/gajim_remote.py:58 gajim/common/exceptions.py:71
+#: gajim/gajim_remote.py:59 gajim/common/exceptions.py:71
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "在這臺電腦上沒有 D-Bus 或是 Python 模組缺失"
 
-#: gajim/gajim_remote.py:80
+#: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
 msgstr "為特定命令顯示求助"
 
-#: gajim/gajim_remote.py:83
+#: gajim/gajim_remote.py:84
 msgid "command"
 msgstr "命令"
 
-#: gajim/gajim_remote.py:84
+#: gajim/gajim_remote.py:85
 msgid "show help on command"
 msgstr "為命令顯示求助"
 
-#: gajim/gajim_remote.py:88
+#: gajim/gajim_remote.py:89
 msgid "Shows or hides the roster window"
 msgstr "顯示/隱藏聯絡人清單視窗"
 
-#: gajim/gajim_remote.py:92
+#: gajim/gajim_remote.py:93
 msgid "Pops up a window with the next pending event"
 msgstr "為下一筆未處理事件彈出視窗"
 
-#: gajim/gajim_remote.py:96
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr "列印聯絡人清單中所有聯絡人。每個聯絡人一列。"
 
-#: gajim/gajim_remote.py:98
+#: gajim/gajim_remote.py:99 gajim/gajim_remote.py:114 gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161 gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:212 gajim/gajim_remote.py:221
+#: gajim/gajim_remote.py:228
+#, fuzzy
+msgid "?CLI:account"
+msgstr "帳號"
+
+#: gajim/gajim_remote.py:99
 msgid "show only contacts of the given account"
 msgstr "只顯示指定帳號的聯絡人"
 
-#: gajim/gajim_remote.py:104
+#: gajim/gajim_remote.py:105
 msgid "Prints a list of registered accounts"
 msgstr "列印註冊的帳號"
 
-#: gajim/gajim_remote.py:108
+#: gajim/gajim_remote.py:109
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "變更一個或多個帳號狀態"
 
-#: gajim/gajim_remote.py:111
+#: gajim/gajim_remote.py:112
+#, fuzzy
+msgid "?CLI:status"
+msgstr "狀態"
+
+#: gajim/gajim_remote.py:112
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4348,26 +4594,37 @@ msgstr ""
 "下列之一: offline，online，chat，away，xa，dnd，invisible。如果沒有設定，使用"
 "帳號先前的狀態"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
+#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: gajim/gajim_remote.py:113
 msgid "status message"
 msgstr "狀態訊息"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:114
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr "變更帳號的狀態。如果不指明，將變更設定\"與全域同步\"選項的帳號"
 
-#: gajim/gajim_remote.py:119
+#: gajim/gajim_remote.py:120
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "變更一個或多個帳號的優先等級"
 
-#: gajim/gajim_remote.py:121
+#: gajim/gajim_remote.py:122
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "優先等級"
+
+#: gajim/gajim_remote.py:122
 msgid "priority you want to give to the account"
 msgstr "您想要給予這個帳號的優先等級"
 
-#: gajim/gajim_remote.py:123
+#: gajim/gajim_remote.py:124
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4375,7 +4632,7 @@ msgstr ""
 "變更指定帳號的優先等級。如果不指明，將變更所有設定了\"與全域狀態同步\"選項的"
 "帳號"
 
-#: gajim/gajim_remote.py:129
+#: gajim/gajim_remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4384,29 +4641,29 @@ msgstr ""
 "傳送新聊天訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇"
 "\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: gajim/gajim_remote.py:133 gajim/gajim_remote.py:146
+#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "聯絡人的JID將收到訊息"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:148
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:160
 msgid "message contents"
 msgstr "訊息內容"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
+#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，該訊息將使用本公共密鑰加密"
 
-#: gajim/gajim_remote.py:137 gajim/gajim_remote.py:151
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
+#: gajim/gajim_remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，訊息將被用此帳號傳送"
 
-#: gajim/gajim_remote.py:142
+#: gajim/gajim_remote.py:143
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4415,151 +4672,151 @@ msgstr ""
 "傳送新聊天訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇"
 "\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "subject"
 msgstr "主題"
 
-#: gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:148
 msgid "message subject"
 msgstr "訊息主題"
 
-#: gajim/gajim_remote.py:156
+#: gajim/gajim_remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "向一個您加入的聊天室傳送新訊息。"
 
-#: gajim/gajim_remote.py:158
+#: gajim/gajim_remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "要收到這條訊息的聊天室的 JID"
 
-#: gajim/gajim_remote.py:165
+#: gajim/gajim_remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "獲得聯絡人的詳細資訊"
 
-#: gajim/gajim_remote.py:167 gajim/gajim_remote.py:180
-#: gajim/gajim_remote.py:210
+#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:211
 msgid "JID of the contact"
 msgstr "聯絡人的 JID "
 
-#: gajim/gajim_remote.py:171
+#: gajim/gajim_remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "獲得帳號的詳細資訊"
 
-#: gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:174
 msgid "Name of the account"
 msgstr "帳號名稱"
 
-#: gajim/gajim_remote.py:177
+#: gajim/gajim_remote.py:178
 msgid "Sends file to a contact"
 msgstr "向聯絡人傳送檔案"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "file"
 msgstr "檔案"
 
-#: gajim/gajim_remote.py:179
+#: gajim/gajim_remote.py:180
 msgid "File path"
 msgstr "檔案路徑"
 
-#: gajim/gajim_remote.py:181
+#: gajim/gajim_remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，檔案將被用此帳號傳送"
 
-#: gajim/gajim_remote.py:186
+#: gajim/gajim_remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "列出所有的參數及它們的值"
 
-#: gajim/gajim_remote.py:190
+#: gajim/gajim_remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "將\"密鑰\"的值設為\"值\""
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 msgid "key=value"
 msgstr "鍵=值"
 
-#: gajim/gajim_remote.py:192
+#: gajim/gajim_remote.py:193
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "\"密鑰\"是參數名稱，而\"值\"是賦予參數的數值"
 
-#: gajim/gajim_remote.py:197
+#: gajim/gajim_remote.py:198
 msgid "Deletes a preference item"
 msgstr "刪除一個參數項"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "key"
 msgstr "鍵"
 
-#: gajim/gajim_remote.py:199
+#: gajim/gajim_remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "需要刪除的參數名稱"
 
-#: gajim/gajim_remote.py:203
+#: gajim/gajim_remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "將目前Gajim的國家設定寫入 .config 檔案"
 
-#: gajim/gajim_remote.py:208
+#: gajim/gajim_remote.py:209
 msgid "Removes contact from roster"
 msgstr "從聯絡人清單移除聯絡人"
 
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，將從此帳號清單下移出聯絡人"
 
-#: gajim/gajim_remote.py:218
+#: gajim/gajim_remote.py:219
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "回傳目前狀態(如不指定帳號將回傳全域設定)"
 
-#: gajim/gajim_remote.py:225
+#: gajim/gajim_remote.py:226
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "回傳目前狀態資訊(如不指定帳號將回傳全域設定)"
 
-#: gajim/gajim_remote.py:232
+#: gajim/gajim_remote.py:233
 msgid "Returns number of unread messages"
 msgstr "回傳未讀訊息數"
 
-#: gajim/gajim_remote.py:237
+#: gajim/gajim_remote.py:238
 msgid "Sends custom XML"
 msgstr "傳送自訂 XML"
 
-#: gajim/gajim_remote.py:239
+#: gajim/gajim_remote.py:240
 msgid "XML to send"
 msgstr "傳送 XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr "XML 將被傳送的帳號; 如果不指定，XML 將被傳送至所有帳號"
 
-#: gajim/gajim_remote.py:246
+#: gajim/gajim_remote.py:247
 msgid "Change the avatar"
 msgstr "變更頭像"
 
-#: gajim/gajim_remote.py:248
+#: gajim/gajim_remote.py:249
 msgid "Picture to use"
 msgstr "要使用的圖片"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:250
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr "要設定為這個頭像的帳號; 如果不指定，所有帳號都將被設定為這個頭像。"
 
-#: gajim/gajim_remote.py:256
+#: gajim/gajim_remote.py:257
 msgid "Check if Gajim is running"
 msgstr "請檢查 Gajim 是否正在執行"
 
-#: gajim/gajim_remote.py:260
+#: gajim/gajim_remote.py:261
 msgid "Shows or hides the ipython window"
 msgstr "顯示/隱藏 ipython 視窗"
 
-#: gajim/gajim_remote.py:286
+#: gajim/gajim_remote.py:287
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"聯絡人 JID\"參數"
 
-#: gajim/gajim_remote.py:306
+#: gajim/gajim_remote.py:307
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4568,15 +4825,15 @@ msgstr ""
 "\"%s\" 不在您的聯絡人清單中。\n"
 "請為傳送此訊息指定帳號。"
 
-#: gajim/gajim_remote.py:309
+#: gajim/gajim_remote.py:310
 msgid "You have no active account"
 msgstr "沒有活動的帳號"
 
-#: gajim/gajim_remote.py:357
+#: gajim/gajim_remote.py:358
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "似乎 Gajim 不在執行。因此您無法使用 gajim-remote。"
 
-#: gajim/gajim_remote.py:384
+#: gajim/gajim_remote.py:385
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4585,16 +4842,16 @@ msgstr ""
 "用法: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:388
+#: gajim/gajim_remote.py:389
 msgid "Arguments:"
 msgstr "參數:"
 
-#: gajim/gajim_remote.py:392
+#: gajim/gajim_remote.py:393
 #, python-format
 msgid "%s not found"
 msgstr " %s 找不到"
 
-#: gajim/gajim_remote.py:398
+#: gajim/gajim_remote.py:399
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4605,7 +4862,7 @@ msgstr ""
 "用法: %s 命令 [參數] \n"
 "命令是下列之一: \n"
 
-#: gajim/gajim_remote.py:468
+#: gajim/gajim_remote.py:469
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4614,7 +4871,7 @@ msgstr ""
 "參數太多。\n"
 "輸入 \"%(basename)s help %(command)s\" 獲取更多資訊"
 
-#: gajim/gajim_remote.py:473
+#: gajim/gajim_remote.py:474
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4788,11 +5045,6 @@ msgstr "一週末"
 msgid "Weekend!"
 msgstr "週末"
 
-#: gajim/common/passwords.py:84
-#, fuzzy, python-format
-msgid "XMPP account %s"
-msgstr "XMPP 帳號 %s@%s"
-
 #: gajim/common/connection_handlers_events.py:352
 #, python-format
 msgid ""
@@ -4816,52 +5068,52 @@ msgstr "聊天室已經被銷毀了"
 msgid "You can join this room instead: %s"
 msgstr "做為替代，您可以加入這個聊天室: %s"
 
-#: gajim/common/connection_handlers_events.py:1935
+#: gajim/common/connection_handlers_events.py:1947
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "不明的 SSL 錯誤: %d"
 
-#: gajim/common/connection_handlers_events.py:2574
+#: gajim/common/connection_handlers_events.py:2593
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 發來的新訊息"
 
-#: gajim/common/connection_handlers_events.py:2580
+#: gajim/common/connection_handlers_events.py:2599
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "來自聊天室 %s 的私人訊息"
 
-#: gajim/common/connection_handlers_events.py:2583
+#: gajim/common/connection_handlers_events.py:2602
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s:  %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2586
+#: gajim/common/connection_handlers_events.py:2605
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "來自 %(nickname)s 的訊息"
 
-#: gajim/common/connection_handlers_events.py:2592
+#: gajim/common/connection_handlers_events.py:2611
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "來自 %(nickname)s 的新訊息"
 
-#: gajim/common/connection_handlers_events.py:2758
+#: gajim/common/connection_handlers_events.py:2777
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 變更了狀態"
 
-#: gajim/common/connection_handlers_events.py:2766
+#: gajim/common/connection_handlers_events.py:2785
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上線了"
 
-#: gajim/common/connection_handlers_events.py:2772
+#: gajim/common/connection_handlers_events.py:2791
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 離開了"
 
-#: gajim/common/contacts.py:388
+#: gajim/common/contacts.py:386
 msgid "Not in roster"
 msgstr "不在聯絡人清單中"
 
@@ -5619,77 +5871,75 @@ msgstr "為這個帳號啟用 ESession 加密。"
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim 是否應該在可能時自動發起加密的作業階段?"
 
-#: gajim/common/config.py:343
-msgid ""
-"Ordered list (space separated) of connection type to try. Can contain tls, "
-"ssl or plain"
-msgstr "應嘗試的連線類型的有序清單(用空格分隔)。可以包含 tls，ssl，或 plain"
+#: gajim/common/config.py:342
+msgid "Allow plaintext connections"
+msgstr ""
 
-#: gajim/common/config.py:346
+#: gajim/common/config.py:345
 msgid ""
 "List (space separated) of authentication mechanisms to try. Can contain "
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
 
-#: gajim/common/config.py:347
+#: gajim/common/config.py:346
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr "在使用明文連線傳送密碼前顯示一個警告對話方塊。"
 
-#: gajim/common/config.py:348
+#: gajim/common/config.py:347
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "在使用標準 SSL 函式庫前顯示一個警告對話方塊。"
 
-#: gajim/common/config.py:349
+#: gajim/common/config.py:348
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "在透過明文連線傳送明文密碼前顯示警告對話框。"
 
-#: gajim/common/config.py:352
+#: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
 msgstr "應忽略的 SSL 錯誤清單，以空格分隔"
 
-#: gajim/common/config.py:358
+#: gajim/common/config.py:357
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: gajim/common/config.py:359
+#: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
 
-#: gajim/common/config.py:360
+#: gajim/common/config.py:359
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: gajim/common/config.py:363
+#: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
 msgstr "在不活動後傳送的空白"
 
-#: gajim/common/config.py:364
+#: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
 msgstr "在不活動後傳送的 XMPP ping"
 
-#: gajim/common/config.py:368
+#: gajim/common/config.py:367
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect?"
 msgstr "在重新連線前等待 ping alive packet 的回應多少秒"
 
-#: gajim/common/config.py:372
+#: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
 msgstr "為 Jabberd2 變通"
 
-#: gajim/common/config.py:375
+#: gajim/common/config.py:374
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5697,99 +5947,109 @@ msgstr ""
 "如果選取，Gajim 會使用您在 file_transfer_proxies 選項中定義的 IP 和代理進行檔"
 "案傳輸。"
 
-#: gajim/common/config.py:376
+#: gajim/common/config.py:375
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: gajim/common/config.py:389
+#: gajim/common/config.py:388
 msgid "Answer to receipt requests"
 msgstr "對回執請求的回應"
 
-#: gajim/common/config.py:390
+#: gajim/common/config.py:389
 msgid "Sent receipt requests"
 msgstr "傳送回執請求"
 
-#: gajim/common/config.py:399
+#: gajim/common/config.py:398
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "允許 Gajim 發送您正在執行的作業系統相關資訊。"
 
-#: gajim/common/config.py:400
+#: gajim/common/config.py:399
 msgid "Allow Gajim to send your local time."
 msgstr "允許 Gajim 發送您的本地時間。"
 
-#: gajim/common/config.py:401
+#: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr "在協商加密的作業階段時，Gajim 是否應該假設您想要您的訊息被記錄?"
 
-#: gajim/common/config.py:404
+#: gajim/common/config.py:403
 msgid "Message that is sent to contacts you want to add"
 msgstr "向您希望加入的聯絡人傳送的訊息"
 
-#: gajim/common/config.py:405
+#: gajim/common/config.py:404
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: gajim/common/config.py:406
+#: gajim/common/config.py:405
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: gajim/common/config.py:407
+#: gajim/common/config.py:406
 #, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
 msgstr "匿名認證"
 
-#: gajim/common/config.py:408
+#: gajim/common/config.py:407
 #, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
 msgstr "匿名認證(_Y)"
 
-#: gajim/common/config.py:409
+#: gajim/common/config.py:408
 #, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
 msgstr "匿名認證(_Y)"
 
-#: gajim/common/config.py:410
+#: gajim/common/config.py:409
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: gajim/common/config.py:474 gajim/common/config.py:479
+#: gajim/common/config.py:411
+msgid "HTTP Upload: Enable HTTPS Verification"
+msgstr ""
+
+#: gajim/common/config.py:412
+msgid ""
+"Preferred file transfer mechanism for file drag&drop on chat window. Can be "
+"'httpupload' (default) or 'jingle'"
+msgstr ""
+
+#: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
 msgstr "想要進行拼寫檢查的語言"
 
-#: gajim/common/config.py:476
+#: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
 msgstr ""
 
-#: gajim/common/config.py:480
+#: gajim/common/config.py:481
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
 
-#: gajim/common/config.py:481
+#: gajim/common/config.py:482
 #, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit, "
 "-2 means global value"
 msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
 
-#: gajim/common/config.py:482
+#: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
 
-#: gajim/common/config.py:485
+#: gajim/common/config.py:486
 #, fuzzy
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
@@ -5799,106 +6059,106 @@ msgstr ""
 "表述在離開時是否啟用外掛程式(在 Gajim 離開時這會被儲存)。這個選項不應該用於啟"
 "用或停用外掛程式。使用圖形介面代替。"
 
-#: gajim/common/config.py:490 gajim/common/pep.py:157
+#: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡覺"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back soon"
 msgstr "馬上回來"
 
-#: gajim/common/config.py:491
+#: gajim/common/config.py:492
 msgid "Back in some minutes."
 msgstr "幾分鐘就回來。"
 
-#: gajim/common/config.py:492 gajim/common/pep.py:127
+#: gajim/common/config.py:493 gajim/common/pep.py:127
 msgid "Eating"
 msgstr "吃東西"
 
-#: gajim/common/config.py:492
+#: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
 msgstr "我在吃東西，請留言"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "Movie"
 msgstr "電影"
 
-#: gajim/common/config.py:493
+#: gajim/common/config.py:494
 msgid "I'm watching a movie."
 msgstr "我正在看電影。"
 
-#: gajim/common/config.py:494 gajim/common/pep.py:186
+#: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: gajim/common/config.py:494
+#: gajim/common/config.py:495
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "Phone"
 msgstr "打電話"
 
-#: gajim/common/config.py:495
+#: gajim/common/config.py:496
 msgid "I'm on the phone."
 msgstr "我正在打電話"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "Out"
 msgstr "外出"
 
-#: gajim/common/config.py:496
+#: gajim/common/config.py:497
 msgid "I'm out enjoying life."
 msgstr "我正在享受戶外生活。"
 
-#: gajim/common/config.py:507
+#: gajim/common/config.py:508
 msgid "I'm available."
 msgstr "我現在線上。"
 
-#: gajim/common/config.py:508
+#: gajim/common/config.py:509
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: gajim/common/config.py:510
+#: gajim/common/config.py:511
 msgid "I'm not available."
 msgstr "我已經很久不在了。"
 
-#: gajim/common/config.py:511
+#: gajim/common/config.py:512
 msgid "Do not disturb."
 msgstr "請勿打擾。"
 
-#: gajim/common/config.py:512 gajim/common/config.py:513
+#: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
 msgstr "再見!"
 
-#: gajim/common/config.py:524
+#: gajim/common/config.py:525
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 "當收到的多人聊天訊息包含 \"muc_highlight_words\" 或您的暱稱時播放的聲音。"
 
-#: gajim/common/config.py:525
+#: gajim/common/config.py:526
 msgid "Sound to play when any MUC message arrives."
 msgstr "收到任意多人聊天訊息播放的聲音。"
 
-#: gajim/common/config.py:533 gajim/common/optparser.py:351
+#: gajim/common/config.py:534 gajim/common/optparser.py:355
 msgid "green"
 msgstr "綠色"
 
-#: gajim/common/config.py:537 gajim/common/optparser.py:337
+#: gajim/common/config.py:538 gajim/common/optparser.py:341
 msgid "grocery"
 msgstr "雜貨店"
 
-#: gajim/common/config.py:541
+#: gajim/common/config.py:542
 msgid "human"
 msgstr "人類別"
 
-#: gajim/common/config.py:545
+#: gajim/common/config.py:546
 msgid "marine"
 msgstr "海洋"
 
-#: gajim/common/config.py:552
+#: gajim/common/config.py:553
 #, fuzzy
 msgid "Tor"
 msgstr "To"
@@ -5976,36 +6236,49 @@ msgstr "所有未讀訊息都已被轉發。"
 msgid "Forward unread message then disconnect"
 msgstr " 轉發未讀訊息然後中斷連線"
 
+#: gajim/common/httpupload.py:137
+msgid "File is empty"
+msgstr "檔案為空"
+
+#: gajim/common/httpupload.py:140
+msgid "File does not exist"
+msgstr "檔案不存在"
+
+#: gajim/common/httpupload.py:147 gajim/common/httpupload.py:204
+#, python-format
+msgid "File is too large, maximum allowed file size is: %s"
+msgstr ""
+
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "建立日誌資料庫"
 
-#: gajim/common/check_paths.py:99
+#: gajim/common/check_paths.py:98
 msgid "creating cache database"
 msgstr "建立快取資料庫"
 
-#: gajim/common/check_paths.py:262
+#: gajim/common/check_paths.py:261
 #, fuzzy, python-format
 msgid "moving %(src)s to %(dst)s"
 msgstr "傳送 %s 給 %s"
 
-#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
-#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
-#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
-#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
+#: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
+#: gajim/common/check_paths.py:315 gajim/common/check_paths.py:322
+#: gajim/common/check_paths.py:329 gajim/common/check_paths.py:336
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 是一個檔案但它應該是一個目錄"
 
-#: gajim/common/check_paths.py:289 gajim/common/check_paths.py:296
-#: gajim/common/check_paths.py:303 gajim/common/check_paths.py:310
-#: gajim/common/check_paths.py:317 gajim/common/check_paths.py:324
-#: gajim/common/check_paths.py:331 gajim/common/check_paths.py:338
-#: gajim/common/check_paths.py:350 gajim/common/check_paths.py:358
+#: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
+#: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
+#: gajim/common/check_paths.py:316 gajim/common/check_paths.py:323
+#: gajim/common/check_paths.py:330 gajim/common/check_paths.py:337
+#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
 msgid "Gajim will now exit"
 msgstr "Gajim 即將離開"
 
-#: gajim/common/check_paths.py:349 gajim/common/check_paths.py:357
+#: gajim/common/check_paths.py:348 gajim/common/check_paths.py:356
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一個目錄但它應該是一個檔案"
@@ -6015,11 +6288,11 @@ msgstr "%s 是一個目錄但它應該是一個檔案"
 msgid "Error: cannot open %s for reading"
 msgstr "錯誤: 無法按讀開啟檔案 %s"
 
-#: gajim/common/optparser.py:346 gajim/common/optparser.py:347
+#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
 msgid "cyan"
 msgstr "青色"
 
-#: gajim/common/optparser.py:415
+#: gajim/common/optparser.py:419
 msgid "migrating logs database to indices"
 msgstr "遷移記錄資料庫到索引"
 
@@ -6028,188 +6301,188 @@ msgstr "遷移記錄資料庫到索引"
 msgid "%s is not a valid loglevel"
 msgstr "%s 不是一個合法的日誌層級"
 
-#: gajim/common/connection.py:78
+#: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
 msgstr "無法獲得發行者的證書"
 
-#: gajim/common/connection.py:79
+#: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
 msgstr "無法獲得證書吊銷清單"
 
-#: gajim/common/connection.py:80
+#: gajim/common/connection.py:81
 msgid "Unable to decrypt certificate's signature"
 msgstr "無法解密證書籤名稱"
 
-#: gajim/common/connection.py:81
+#: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
 msgstr "無法解密證書吊銷清單的簽名"
 
-#: gajim/common/connection.py:82
+#: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
 msgstr "無法解碼發行者的公鑰"
 
-#: gajim/common/connection.py:83
+#: gajim/common/connection.py:84
 msgid "Certificate signature failure"
 msgstr "證書籤名稱失敗"
 
-#: gajim/common/connection.py:84
+#: gajim/common/connection.py:85
 msgid "CRL signature failure"
 msgstr "吊銷證書清單簽名失敗"
 
-#: gajim/common/connection.py:85
+#: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
 msgstr "證書還未生效"
 
-#: gajim/common/connection.py:86
+#: gajim/common/connection.py:87
 msgid "Certificate has expired"
 msgstr "證書已過期"
 
-#: gajim/common/connection.py:87
+#: gajim/common/connection.py:88
 msgid "CRL is not yet valid"
 msgstr "證書吊銷清單還未生效"
 
-#: gajim/common/connection.py:88
+#: gajim/common/connection.py:89
 msgid "CRL has expired"
 msgstr "證書吊銷清單已過期"
 
-#: gajim/common/connection.py:89
+#: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
 msgstr "格式錯誤，在證書的'不早於'欄位"
 
-#: gajim/common/connection.py:90
+#: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
 msgstr "格式錯誤，在證書的'不遲於'欄位"
 
-#: gajim/common/connection.py:91
+#: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'最後更新'欄位"
 
-#: gajim/common/connection.py:92
+#: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'下次更新'欄位"
 
-#: gajim/common/connection.py:93
+#: gajim/common/connection.py:94
 msgid "Out of memory"
 msgstr "記憶體耗盡"
 
-#: gajim/common/connection.py:94
+#: gajim/common/connection.py:95
 msgid "Self signed certificate"
 msgstr "自簽名的證書"
 
-#: gajim/common/connection.py:95
+#: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
 msgstr "自簽名的證書，在證書鏈中"
 
-#: gajim/common/connection.py:96
+#: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
 msgstr "無法獲得本地發行者證書"
 
-#: gajim/common/connection.py:97
+#: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
 msgstr "無法驗證第一個證書"
 
-#: gajim/common/connection.py:98
+#: gajim/common/connection.py:99
 msgid "Certificate chain too long"
 msgstr "證書鏈太長"
 
-#: gajim/common/connection.py:99
+#: gajim/common/connection.py:100
 msgid "Certificate revoked"
 msgstr "證書已被吊銷"
 
-#: gajim/common/connection.py:100
+#: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
 msgstr "無效的 CA 證書"
 
-#: gajim/common/connection.py:101
+#: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
 msgstr "超過了路徑長度限制"
 
-#: gajim/common/connection.py:102
+#: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
 msgstr "不支援的證書用途"
 
-#: gajim/common/connection.py:103
+#: gajim/common/connection.py:104
 msgid "Certificate not trusted"
 msgstr "不被信任的證書"
 
-#: gajim/common/connection.py:104
+#: gajim/common/connection.py:105
 msgid "Certificate rejected"
 msgstr "證書被拒絕"
 
-#: gajim/common/connection.py:105
+#: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
 msgstr "Subject 與 發行者 不匹配"
 
-#: gajim/common/connection.py:106
+#: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 與 subject key identifier 不匹配"
 
-#: gajim/common/connection.py:107
+#: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 與 發行者序號 不匹配"
 
-#: gajim/common/connection.py:108
+#: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
 msgstr "密鑰用途中不包含證書籤名稱"
 
-#: gajim/common/connection.py:109
+#: gajim/common/connection.py:110
 msgid "Application verification failure"
 msgstr "應用程式驗證失敗"
 
-#: gajim/common/connection.py:867
+#: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帳號\"%s\"的連線丟失"
 
-#: gajim/common/connection.py:868
+#: gajim/common/connection.py:871
 msgid "Reconnect manually."
 msgstr "手動重連。"
 
-#: gajim/common/connection.py:879
+#: gajim/common/connection.py:882
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "伺服器 %(name)s 對註冊請求的回應有誤: %(error)s"
 
-#: gajim/common/connection.py:920
+#: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "伺服器 %s 提供了一個不同的註冊表單"
 
-#: gajim/common/connection.py:1265
+#: gajim/common/connection.py:1277
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "沒有能夠連線到\"%s\""
 
-#: gajim/common/connection.py:1268
+#: gajim/common/connection.py:1280
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "沒有能夠連線到\"%s\""
 
-#: gajim/common/connection.py:1275
+#: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
 msgstr "伺服器回應: %s"
 
-#: gajim/common/connection.py:1290
+#: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
 msgstr "連線代理伺服器失敗"
 
-#: gajim/common/connection.py:1328 gajim/common/connection.py:1440
+#: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "沒有能夠連線到帳號 %s"
 
-#: gajim/common/connection.py:1329 gajim/common/connection.py:1441
+#: gajim/common/connection.py:1341 gajim/common/connection.py:1444
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帳號 %s 的連線丟失。重新嘗試連線。"
 
-#: gajim/common/connection.py:1363
+#: gajim/common/connection.py:1366
 #, fuzzy, python-format
 msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s 證書的認證可能是無效的"
 
-#: gajim/common/connection.py:1366
+#: gajim/common/connection.py:1369
 #, python-format
 msgid ""
 "\n"
@@ -6218,7 +6491,7 @@ msgstr ""
 "\n"
 "SSL 錯誤: <b>%s</b>"
 
-#: gajim/common/connection.py:1368
+#: gajim/common/connection.py:1371
 #, python-format
 msgid ""
 "\n"
@@ -6227,38 +6500,38 @@ msgstr ""
 "\n"
 "不明 SSL 錯誤: %d"
 
-#: gajim/common/connection.py:1414
+#: gajim/common/connection.py:1417
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "%s 證書的認證可能是無效的"
 
-#: gajim/common/connection.py:1464 gajim/common/connection.py:2236
-#: gajim/common/zeroconf/connection_zeroconf.py:204
+#: gajim/common/connection.py:1467 gajim/common/connection.py:2235
+#: gajim/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "沒有能夠連線到\"%s\""
 
-#: gajim/common/connection.py:1503
+#: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\"登入驗證失敗"
 
-#: gajim/common/connection.py:1504
+#: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
 msgstr "請檢查登入資訊和密碼的正確性"
 
-#: gajim/common/connection.py:2095
+#: gajim/common/connection.py:2094
 #, fuzzy, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
 msgstr "已傳送聯絡人: \"%s\" (%s)"
 
-#: gajim/common/connection.py:2099
+#: gajim/common/connection.py:2098
 msgid "Sent contacts:"
 msgstr "已傳送聯絡人:"
 
-#: gajim/common/connection.py:2253 gajim/common/connection.py:2275
+#: gajim/common/connection.py:2252 gajim/common/connection.py:2274
 msgid "Not fetched because of invisible status"
 msgstr "由於隱身狀態，未獲取"
 
@@ -7136,256 +7409,280 @@ msgstr "視訊輸入"
 msgid "video output"
 msgstr "視訊輸出"
 
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:296
 #, fuzzy
 msgid "Server must be between 1 and 1023 bytes"
 msgstr "伺服器名稱必須在 1 到 1023 個字元之間"
 
-#: gajim/common/helpers.py:303
+#: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
 msgstr "主機名稱中有無效的字元。"
 
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:306
 msgid "Server address required."
 msgstr "伺服器的位址是必須的。"
 
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:310
 #, fuzzy
 msgid "Username must be between 1 and 1023 bytes"
 msgstr "使用者名稱必須在 1 到 1023 個字元之間"
 
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:318
 msgid "Invalid character in username."
 msgstr "在使用者名稱中有無效的字元。"
 
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:324
 #, fuzzy
 msgid "Resource must be between 1 and 1023 bytes"
 msgstr "資源必須在 1 到 1023 個字元之間"
 
-#: gajim/common/helpers.py:331
+#: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
 msgstr "資源中含有無效字元。"
 
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:372
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: gajim/common/helpers.py:376
+#: gajim/common/helpers.py:377
 msgid "_Not Available"
 msgstr "離開很久了(_N)"
 
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:382
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: gajim/common/helpers.py:390
+#: gajim/common/helpers.py:387
+msgid "?user status:_Available"
+msgstr "線上(_A)"
+
+#: gajim/common/helpers.py:391
 msgid "Connecting"
 msgstr "正在連線"
 
-#: gajim/common/helpers.py:393
+#: gajim/common/helpers.py:394
 msgid "A_way"
 msgstr "離開(_A)"
 
-#: gajim/common/helpers.py:398
+#: gajim/common/helpers.py:399
 msgid "_Offline"
 msgstr "離線(_O)"
 
-#: gajim/common/helpers.py:403
+#: gajim/common/helpers.py:404
 msgid "_Invisible"
 msgstr "隱身(_I)"
 
-#: gajim/common/helpers.py:428
+#: gajim/common/helpers.py:410
+msgid "?contact has status:Unknown"
+msgstr "不明"
+
+#: gajim/common/helpers.py:412
+msgid "?contact has status:Has errors"
+msgstr "有錯誤"
+
+#: gajim/common/helpers.py:427
+msgid "?Subscription we already have:None"
+msgstr "無"
+
+#: gajim/common/helpers.py:429
 msgid "To"
 msgstr "To"
 
-#: gajim/common/helpers.py:430
+#: gajim/common/helpers.py:431
 msgid "From"
 msgstr "From"
 
-#: gajim/common/helpers.py:432
+#: gajim/common/helpers.py:433
 msgid "Both"
 msgstr "Both"
 
-#: gajim/common/helpers.py:442
+#: gajim/common/helpers.py:441
+msgid "?Ask (for Subscription):None"
+msgstr "無"
+
+#: gajim/common/helpers.py:443
 msgid "Subscribe"
 msgstr "認證"
 
-#: gajim/common/helpers.py:454
+#: gajim/common/helpers.py:452
+msgid "?Group Chat Contact Role:None"
+msgstr "無"
+
+#: gajim/common/helpers.py:455
 msgid "Moderators"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:456
+#: gajim/common/helpers.py:457
 msgid "Moderator"
 msgstr "主持人"
 
-#: gajim/common/helpers.py:459
+#: gajim/common/helpers.py:460
 msgid "Participants"
 msgstr "參與者"
 
-#: gajim/common/helpers.py:461
+#: gajim/common/helpers.py:462
 msgid "Participant"
 msgstr "參與者"
 
-#: gajim/common/helpers.py:464
+#: gajim/common/helpers.py:465
 msgid "Visitors"
 msgstr "訪客"
 
-#: gajim/common/helpers.py:466
+#: gajim/common/helpers.py:467
 msgid "Visitor"
 msgstr "訪客"
 
-#: gajim/common/helpers.py:517
+#: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
 msgstr "注意著與您的對話"
 
-#: gajim/common/helpers.py:519
+#: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: gajim/common/helpers.py:521
+#: gajim/common/helpers.py:522
 #, fuzzy
 msgid "is composing a message…"
 msgstr "正在輸入訊息…"
 
-#: gajim/common/helpers.py:524
+#: gajim/common/helpers.py:525
 msgid "paused composing a message"
 msgstr "暫停輸入訊息"
 
-#: gajim/common/helpers.py:526
+#: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
 msgstr "關閉了聊天視窗或標籤"
 
-#: gajim/common/helpers.py:753
+#: gajim/common/helpers.py:754
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: gajim/common/helpers.py:756
+#: gajim/common/helpers.py:757
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
-#: gajim/common/helpers.py:760
+#: gajim/common/helpers.py:761
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: gajim/common/helpers.py:763
+#: gajim/common/helpers.py:764
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
-#: gajim/common/helpers.py:767
+#: gajim/common/helpers.py:768
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: gajim/common/helpers.py:770
+#: gajim/common/helpers.py:771
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: gajim/common/helpers.py:773
+#: gajim/common/helpers.py:774
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: gajim/common/helpers.py:1140 gajim/common/helpers.py:1147
+#: gajim/common/helpers.py:1141 gajim/common/helpers.py:1148
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 條訊息未處理"
 
-#: gajim/common/helpers.py:1154
+#: gajim/common/helpers.py:1155
 #, fuzzy, python-format
 msgid "from room %s"
 msgstr " 來自聊天室 %s"
 
-#: gajim/common/helpers.py:1157 gajim/common/helpers.py:1174
+#: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
 #, fuzzy, python-format
 msgid "from user %s"
 msgstr " 來自使用者 %s"
 
-#: gajim/common/helpers.py:1159
+#: gajim/common/helpers.py:1160
 #, fuzzy, python-format
 msgid "from %s"
 msgstr " 來自 %s"
 
-#: gajim/common/helpers.py:1166 gajim/common/helpers.py:1172
+#: gajim/common/helpers.py:1167 gajim/common/helpers.py:1173
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 個未處理事件"
 
-#: gajim/common/helpers.py:1190 gajim/common/helpers.py:1202
-#: gajim/data/gui/roster_window.ui:11 data/org.gajim.Gajim.desktop.in:4
+#: gajim/common/helpers.py:1191 gajim/common/helpers.py:1203
+#: gajim/data/gui/roster_window.ui:85 data/org.gajim.Gajim.desktop.in:4
 #: data/org.gajim.Gajim.appdata.xml.in:9
 msgid "Gajim"
 msgstr "Gajim"
 
-#: gajim/common/helpers.py:1204
+#: gajim/common/helpers.py:1205
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: gajim/common/helpers.py:1391 gajim/data/gui/add_new_contact_window.ui:24
+#: gajim/common/helpers.py:1392 gajim/data/gui/add_new_contact_window.ui:24
 msgid "I would like to add you to my contact list."
 msgstr "我想加入您到我的聯絡人清單"
 
-#: gajim/common/helpers.py:1393
+#: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
 msgstr "您好，我是$name"
 
-#: gajim/common/helpers.py:1507 gajim/common/helpers.py:1516
-#: gajim/common/helpers.py:1575
+#: gajim/common/helpers.py:1508 gajim/common/helpers.py:1517
+#: gajim/common/helpers.py:1576
 msgid "Timeout loading image"
 msgstr "讀取檔案逾時"
 
-#: gajim/common/helpers.py:1526 gajim/common/helpers.py:1573
+#: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
 msgstr "圖片太大"
 
-#: gajim/common/helpers.py:1537
+#: gajim/common/helpers.py:1538
 #, fuzzy
 msgid "PyCURL is not installed"
 msgstr "證書吊銷清單還未生效"
 
-#: gajim/common/helpers.py:1577
+#: gajim/common/helpers.py:1578
 #, fuzzy
 msgid "Error loading image"
 msgstr "讀取檔案逾時"
 
-#: gajim/common/connection_handlers.py:132
+#: gajim/common/connection_handlers.py:133
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 的註冊資訊未按時抵達"
 
-#: gajim/common/connection_handlers.py:978
+#: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:981
+#: gajim/common/connection_handlers.py:982
 msgid ""
 "This message was encrypted with Legacy OpenPGP and could not be decrypted. "
 "You can install the PGP plugin to handle those messages."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:985
+#: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:991
+#: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
 msgstr ""
 
-#: gajim/common/connection_handlers.py:1059
+#: gajim/common/connection_handlers.py:1060
 msgid "message"
 msgstr "message"
 
-#: gajim/common/connection_handlers.py:1851
+#: gajim/common/connection_handlers.py:1855
 msgid "I would like to add you to my roster."
 msgstr "我想將您加入到我的聯絡人清單。"
 
@@ -7421,43 +7718,43 @@ msgstr ""
 "系統匯流排無法使用。\n"
 "請參考 %(url)s"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:205
+#: gajim/common/zeroconf/connection_zeroconf.py:210
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "請檢查 Avahi 或是 Bonjour 是否已經安裝。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:215
-#: gajim/common/zeroconf/connection_zeroconf.py:219
+#: gajim/common/zeroconf/connection_zeroconf.py:220
+#: gajim/common/zeroconf/connection_zeroconf.py:224
 msgid "Could not start local service"
 msgstr "無法啟動本地服務"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:216
+#: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "無法繫結連接埠 %d。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:220
-#: gajim/common/zeroconf/connection_zeroconf.py:305
-#: gajim/common/zeroconf/connection_zeroconf.py:318
-#: gajim/common/zeroconf/connection_zeroconf.py:334
+#: gajim/common/zeroconf/connection_zeroconf.py:225
+#: gajim/common/zeroconf/connection_zeroconf.py:310
+#: gajim/common/zeroconf/connection_zeroconf.py:323
+#: gajim/common/zeroconf/connection_zeroconf.py:339
 msgid "Please check if avahi-daemon is running."
 msgstr "請檢查 avahi-daemon 是否正在執行。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:304
-#: gajim/common/zeroconf/connection_zeroconf.py:317
-#: gajim/common/zeroconf/connection_zeroconf.py:333
+#: gajim/common/zeroconf/connection_zeroconf.py:309
+#: gajim/common/zeroconf/connection_zeroconf.py:322
+#: gajim/common/zeroconf/connection_zeroconf.py:338
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "無法變更帳號\"%s\"的狀態"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:349
+#: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
 msgstr "您的訊息未能被傳送。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:364
+#: gajim/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "聯絡人離線。您的訊息未能被傳送。"
 
-#: gajim/common/zeroconf/connection_zeroconf.py:386
+#: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "無法建立到主機的連線: 傳送資料逾時。"
@@ -7696,6 +7993,11 @@ msgstr "封禁(_B)"
 msgid "_Add to Roster"
 msgstr "加入至聯絡人清單(_A)"
 
+#: gajim/data/gui/gc_occupants_menu.ui:132
+#, fuzzy
+msgid "_Execute command"
+msgstr "執行命令(_E)…"
+
 #: gajim/data/gui/archiving_313_preferences_item.ui:12
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
@@ -7976,11 +8278,11 @@ msgstr "關於"
 msgid "Con_tinue"
 msgstr "繼續(_C)"
 
-#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:158
+#: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
 msgstr "暫停(_P)"
 
-#: gajim/data/gui/filetransfers.ui:36
+#: gajim/data/gui/filetransfers.ui:36 gajim/data/gui/filetransfers.ui:174
 #: gajim/data/gui/service_registration_window.ui:53
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -7989,31 +8291,31 @@ msgstr "取消(_C)"
 msgid "_Open Containing Folder"
 msgstr "開啟資料夾(_O)"
 
-#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:252
+#: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: gajim/data/gui/filetransfers.ui:112
+#: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
 msgstr "檔案傳輸清單"
 
-#: gajim/data/gui/filetransfers.ui:113
+#: gajim/data/gui/filetransfers.ui:111
 msgid "A list of active, completed and stopped file transfers"
 msgstr "傳送中，傳輸完成和停止傳輸的檔案清單"
 
-#: gajim/data/gui/filetransfers.ui:133
+#: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
 msgstr "清除(_U)"
 
-#: gajim/data/gui/filetransfers.ui:139
+#: gajim/data/gui/filetransfers.ui:137
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "從清單移除已完成，已取消和失敗的檔案傳輸"
 
-#: gajim/data/gui/filetransfers.ui:145
+#: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
 msgstr "從清單中移除檔案傳輸。"
 
-#: gajim/data/gui/filetransfers.ui:146
+#: gajim/data/gui/filetransfers.ui:144
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -8021,32 +8323,37 @@ msgstr ""
 "該作業會從清單中移除單一檔案傳輸。如果傳輸正在進行，它將先被終止，而後\n"
 "被移除"
 
-#: gajim/data/gui/filetransfers.ui:182
+#: gajim/data/gui/filetransfers.ui:180
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete files"
 msgstr "取消選取檔案傳輸並刪除未完成檔案"
 
-#: gajim/data/gui/filetransfers.ui:188
+#: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
 msgstr "取消檔案傳輸"
 
-#: gajim/data/gui/filetransfers.ui:189
+#: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
 msgstr "取消選取檔案的傳輸"
 
-#: gajim/data/gui/filetransfers.ui:207
+#: gajim/data/gui/filetransfers.ui:199
+#, fuzzy
+msgid "_Close"
+msgstr "傳送並關閉(_S)"
+
+#: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
 msgstr "隱藏該視窗"
 
-#: gajim/data/gui/filetransfers.ui:228
+#: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
 msgstr "檔案傳輸完成時提醒我(_N)"
 
-#: gajim/data/gui/filetransfers.ui:238
+#: gajim/data/gui/filetransfers.ui:236
 msgid "When a file transfer is complete show a popup notification"
 msgstr "當檔案傳輸完成時彈出提示"
 
-#: gajim/data/gui/filetransfers.ui:253
+#: gajim/data/gui/filetransfers.ui:254
 msgid "Shows a list of file transfers between you and others"
 msgstr "顯示您與他人進行的傳輸檔案清單"
 
@@ -8055,7 +8362,7 @@ msgid "Register to"
 msgstr "註冊到"
 
 #: gajim/data/gui/service_registration_window.ui:70
-#: gajim/data/gui/roster_item_exchange_window.ui:125
+#: gajim/data/gui/roster_item_exchange_window.ui:126
 msgid "_OK"
 msgstr "確定(_O)"
 
@@ -8086,20 +8393,20 @@ msgstr "字型"
 msgid "Clear formatting"
 msgstr "清楚格式"
 
-#: gajim/data/gui/groupchat_control.ui:229 gajim/data/gui/chat_control.ui:634
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "顯示表情清單(Alt+M)"
-
-#: gajim/data/gui/groupchat_control.ui:323 gajim/data/gui/chat_control.ui:832
+#: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
 #, fuzzy
 msgid "Choose an encryption"
 msgstr "密碼加密"
 
-#: gajim/data/gui/popup_notification_window.ui:54
+#: gajim/data/gui/groupchat_control.ui:326 gajim/data/gui/chat_control.ui:849
+msgid "Show a list of emoticons (Alt+M)"
+msgstr "顯示表情清單(Alt+M)"
+
+#: gajim/data/gui/popup_notification_window.ui:55
 msgid "Event Type"
 msgstr "事件類型"
 
-#: gajim/data/gui/popup_notification_window.ui:99
+#: gajim/data/gui/popup_notification_window.ui:100
 msgid "Event desc"
 msgstr "事件"
 
@@ -8161,7 +8468,7 @@ msgstr "<b>字型</b>"
 msgid "<b>#</b>"
 msgstr "<b>字型</b>"
 
-#: gajim/data/gui/chat_control.ui:777
+#: gajim/data/gui/chat_control.ui:725
 msgid "#"
 msgstr "#"
 
@@ -8873,10 +9180,6 @@ msgstr "開啟(_O)…"
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>進階配置編輯器</b>"
 
-#: gajim/data/gui/preferences_window.ui:2846
-msgid "Advanced"
-msgstr "進階"
-
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
 msgstr "開始聊天(_C)"
@@ -9118,7 +9421,7 @@ msgid "_Open Email Composer"
 msgstr "開啟郵件編輯器(_O)"
 
 #: gajim/data/gui/chat_context_menu.ui:49
-#: gajim/data/gui/subscription_request_popup_menu.ui:12
+#: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
 msgstr "開始聊天(_S)"
 
@@ -9163,6 +9466,10 @@ msgstr "參數"
 msgid "Default:"
 msgstr "預設"
 
+#: gajim/data/gui/voip_call_received_dialog.ui:15
+msgid "<b><big>Incoming call</big></b>"
+msgstr ""
+
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
 msgstr "加入聯絡人"
@@ -9188,6 +9495,16 @@ msgstr "暱稱(_N):"
 msgid "_Group:"
 msgstr "群組(_G):"
 
+#: gajim/data/gui/add_new_contact_window.ui:210
+#, fuzzy
+msgid "Type User ID"
+msgstr "使用者 ID:"
+
+#: gajim/data/gui/add_new_contact_window.ui:223
+#, fuzzy
+msgid "Type Nickname"
+msgstr "暱稱"
+
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
 msgstr ""
@@ -9224,6 +9541,11 @@ msgstr ""
 "您必須連線才能\n"
 "增加此協定的聯絡人。"
 
+#: gajim/data/gui/roster_window.ui:61
+#, fuzzy
+msgid "Change Status Message…"
+msgstr "變更狀態訊息(_C)"
+
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
 msgstr "<b>心情:</b>"
@@ -9438,10 +9760,9 @@ msgstr "執行命令(_E)…"
 msgid "_Verify"
 msgstr "辨別(_V)"
 
-#: gajim/data/gui/application_menu.ui:5 gajim/data/gui/application_menu.ui:71
-#: gajim/data/gui/shortcuts_window.ui:181
-msgid "Accounts"
-msgstr "帳號"
+#: gajim/data/gui/esession_info_window.ui:137
+msgid "(<b>ESession</b> info)"
+msgstr "<b>ESession</b>資訊"
 
 #: gajim/data/gui/application_menu.ui:8
 #, fuzzy
@@ -9468,11 +9789,6 @@ msgstr "只顯示活動的聯絡人(_A)"
 msgid "Show Transports"
 msgstr "顯示代理(_P)"
 
-#: gajim/data/gui/application_menu.ui:32
-#, fuzzy
-msgid "File Transfer"
-msgstr "檔案傳輸"
-
 #: gajim/data/gui/application_menu.ui:43
 #, fuzzy
 msgid "Help"
@@ -9541,48 +9857,33 @@ msgstr "自動聯結時縮到最小(_Z)"
 msgid "Pr_int status:"
 msgstr "印出狀態(_I):"
 
-#: gajim/data/gui/exception_dialog.ui:7
+#: gajim/data/gui/exception_dialog.ui:45
 #, fuzzy
-msgid "Exception"
-msgstr "描述"
+msgid ""
+"A programming error has been detected. It probably is not fatal, but should "
+"be reported to the developers nonetheless."
+msgstr "它可能不是嚴重的，但仍應該被報告給開發者們。"
 
-#: gajim/data/gui/exception_dialog.ui:44
+#: gajim/data/gui/exception_dialog.ui:115
 #, fuzzy
 msgid "Report Bug"
 msgstr "報告錯誤(_R)"
 
-#: gajim/data/gui/exception_dialog.ui:89
-#, fuzzy
-msgid ""
-"A programming error has been detected.\n"
-"It probably is not fatal, but should be reported\n"
-"to the developers nonetheless."
-msgstr "它可能不是嚴重的，但仍應該被報告給開發者們。"
-
-#: gajim/data/gui/subscription_request_window.ui:19
-msgid "Subscription Request"
-msgstr "認證請求"
-
-#: gajim/data/gui/subscription_request_window.ui:89
+#: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
 msgstr "拒絕(_D)"
 
-#: gajim/data/gui/subscription_request_window.ui:94
+#: gajim/data/gui/subscription_request_window.ui:100
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "拒絕向聯絡人授權則他/她將無法知道您是否線上"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: gajim/data/gui/subscription_request_window.ui:132
-msgid "_Actions"
-msgstr "動作(_A)"
-
-#: gajim/data/gui/subscription_request_window.ui:164
+#: gajim/data/gui/subscription_request_window.ui:133
 msgid "Au_thorize"
 msgstr "授權(_T)"
 
-#: gajim/data/gui/subscription_request_window.ui:170
+#: gajim/data/gui/subscription_request_window.ui:138
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "向聯絡人授權則他/她將知道您是否線上"
 
@@ -9600,11 +9901,11 @@ msgstr ""
 msgid "Presets"
 msgstr "_Presence"
 
-#: gajim/data/gui/chat_to_muc_window.ui:14
+#: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
 msgstr "邀請朋友!"
 
-#: gajim/data/gui/chat_to_muc_window.ui:29
+#: gajim/data/gui/chat_to_muc_window.ui:39
 #, fuzzy
 msgid ""
 "You are now entering a groupchat.\n"
@@ -9613,15 +9914,20 @@ msgstr ""
 "您將開始進行多人聊天。\n"
 "選擇您想要邀請的聯絡人"
 
-#: gajim/data/gui/chat_to_muc_window.ui:79
+#: gajim/data/gui/chat_to_muc_window.ui:67
+#: gajim/data/gui/chat_to_muc_window.ui:78
+msgid "column"
+msgstr ""
+
+#: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
 msgstr "請選擇一個多人聊天伺服器"
 
-#: gajim/data/gui/chat_to_muc_window.ui:108
+#: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
 msgstr "多人聊天伺服器"
 
-#: gajim/data/gui/chat_to_muc_window.ui:143
+#: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "邀請(_V)"
 
@@ -9740,11 +10046,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-#: gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
-msgid "Clear"
-msgstr "清潔"
-
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
 msgstr ""
@@ -9906,6 +10207,15 @@ msgstr "顯示所有未處理事件(_E)"
 msgid "Mute Sounds"
 msgstr "靜音"
 
+#: gajim/data/gui/systray_context_menu.ui:75
+#, fuzzy
+msgid "_Preferences"
+msgstr "參數"
+
+#: gajim/data/gui/systray_context_menu.ui:90
+msgid "_Quit"
+msgstr ""
+
 #: gajim/data/gui/single_message_window.ui:59
 msgid "To:"
 msgstr "到:"
@@ -10300,14 +10610,6 @@ msgstr "覆寫？"
 msgid "Configuration"
 msgstr "組態"
 
-#: data/gajim-remote.desktop.in:4
-msgid "Open URI using Gajim"
-msgstr ""
-
-#: data/gajim-remote.desktop.in:6
-msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
-msgstr ""
-
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
 msgstr "Jabber 即時訊息客戶端"
@@ -10433,6 +10735,29 @@ msgid "Plugin manager"
 msgstr "外掛程式失敗"
 
 #, fuzzy
+#~ msgid "XMPP account %s"
+#~ msgstr "XMPP 帳號 %s@%s"
+
+#, fuzzy
+#~ msgid "Exception"
+#~ msgstr "描述"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>someone@somewhere.com</b> 希望您向您的聯絡人清單 <b>加入</b> 一些聯絡"
+#~ "人。"
+
+#~ msgid ""
+#~ "Ordered list (space separated) of connection type to try. Can contain "
+#~ "tls, ssl or plain"
+#~ msgstr "應嘗試的連線類型的有序清單(用空格分隔)。可以包含 tls，ssl，或 plain"
+
+#~ msgid "_Actions"
+#~ msgstr "動作(_A)"
+
+#, fuzzy
 #~ msgid "Requires upower and python-dbus."
 #~ msgstr "需要 python-dbus。"
 
@@ -10631,12 +10956,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Hide all buttons in chat windows"
 #~ msgstr "在聊天視窗中隱藏所有按鈕"
 
-#~ msgid "File is empty"
-#~ msgstr "檔案為空"
-
-#~ msgid "File does not exist"
-#~ msgstr "檔案不存在"
-
 #~ msgid ""
 #~ "If True, Gajim will ask for avatar each contact that did not have an "
 #~ "avatar last time or has one cached that is too old."
@@ -10662,55 +10981,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 #~ msgstr "需要 python-pyopenssl。"
 
-#~ msgid "?user status:_Available"
-#~ msgstr "線上(_A)"
-
-#~ msgid "?user status:Available"
-#~ msgstr "線上"
-
-#~ msgid "?contact has status:Unknown"
-#~ msgstr "不明"
-
-#~ msgid "?contact has status:Has errors"
-#~ msgstr "有錯誤"
-
-#~ msgid "?Subscription we already have:None"
-#~ msgstr "無"
-
-#~ msgid "?Ask (for Subscription):None"
-#~ msgstr "無"
-
-#~ msgid "?Group Chat Contact Role:None"
-#~ msgstr "無"
-
-#~ msgid "?Group Chat Contact Affiliation:None"
-#~ msgstr "無"
-
-#~ msgid "?print_status:All"
-#~ msgstr "全部"
-
-#~ msgid "?print_status:None"
-#~ msgstr "無"
-
-#~ msgid "?features:Available"
-#~ msgstr "可用"
-
-#, fuzzy
-#~ msgid "?CLI:account"
-#~ msgstr "帳號"
-
-#, fuzzy
-#~ msgid "?CLI:status"
-#~ msgstr "狀態"
-
-#, fuzzy
-#~ msgid "?CLI:message"
-#~ msgstr "message"
-
-#, fuzzy
-#~ msgid "?CLI:priority"
-#~ msgstr "優先等級"
-
 #, fuzzy
 #~ msgid "?CLI:room"
 #~ msgstr "聊天室"
@@ -10723,33 +10993,6 @@ msgstr "外掛程式失敗"
 #~ msgid "?CLI:password"
 #~ msgstr "密碼"
 
-#, fuzzy
-#~ msgid "?Noun:Chats"
-#~ msgstr "多人聊天"
-
-#, fuzzy
-#~ msgid "?Noun:Download"
-#~ msgstr "下載"
-
-#, fuzzy
-#~ msgid "?Noun:Upload"
-#~ msgstr "上傳"
-
-#~ msgid "?transfer status:Paused"
-#~ msgstr "?transfer status:暫停"
-
-#~ msgid "?Client:Unknown"
-#~ msgstr "不明"
-
-#~ msgid "?OS:Unknown"
-#~ msgstr "不明"
-
-#~ msgid "?Time:Unknown"
-#~ msgstr "不明"
-
-#~ msgid "?Role in Group Chat:<b>Role:</b>"
-#~ msgstr "?Role in Group Chat:<b>角色</b>"
-
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
 #~ msgstr "使用 D-Bus 和通知處理序顯示通知"
 
@@ -10938,9 +11181,6 @@ msgstr "外掛程式失敗"
 #~ msgid "Choose _Key..."
 #~ msgstr "選擇密鑰(_K)…"
 
-#~ msgid "Use G_PG Agent"
-#~ msgstr "使用 G_PG Agent"
-
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr "如果選取，Gajim 會從一個 GPG agent (比如 Seahorse)得到密碼"
@@ -11075,18 +11315,6 @@ msgstr "外掛程式失敗"
 #~ msgid "<b>XML Input</b>"
 #~ msgstr "<b>XML 輸入</b>"
 
-#, fuzzy
-#~ msgid "Filter"
-#~ msgstr "過濾器:"
-
-#, fuzzy
-#~ msgid "XML Input"
-#~ msgstr "<b>XML 輸入</b>"
-
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "傳送(_S)"
-
 #~ msgid "XML Console for %s"
 #~ msgstr "帳號 %s 的 XML 主控臺"
 
@@ -11548,9 +11776,6 @@ msgstr "外掛程式失敗"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "<b>ESession</b>資訊"
-
 #~ msgid "Enter JID or Contact name"
 #~ msgstr "輸入 JID 或是聯絡人名稱"
 
@@ -11566,13 +11791,6 @@ msgstr "外掛程式失敗"
 #~ msgid "homepage url"
 #~ msgstr "首頁連結"
 
-#~ msgid ""
-#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
-#~ "in your roster."
-#~ msgstr ""
-#~ "<b>someone@somewhere.com</b> 希望您向您的聯絡人清單 <b>加入</b> 一些聯絡"
-#~ "人。"
-
 #~ msgid "More"
 #~ msgstr "更多"